Merged master fixed conflict

WinGood · WinGood · commit d36d97e6c61c · 2015-04-12T02:09:31.000+07:00
diff --git a/lib/hello.html b/lib/hello.html
@@ -4,6 +4,6 @@
     <link type="text/css" rel="stylesheet" media="all" href="style.css" />
   </head>
   <body>
-    <h1>Hello, World!</h1>
-  </body>
+    <h1>Hello, World! Life is great!</h1>
+  </head>
 </html>
