Merge branch 'master' into pages

preview.ts

@@ -18,7 +18,7 @@ createServer((req, res) => {
     return res.end();
   }
   //set content type
-  let non_utf8_content_types: string[] = ["image/png", "image/gif"];
+  let non_utf8_content_types: string[] = ["image/png", "image/gif", "image/jpeg", "video/mp4"];
   let content_type: string;
   switch (req_path.split(".")[1]) {
     case "html":
@@ -40,6 +40,12 @@ createServer((req, res) => {
     case "gif":
       content_type = "image/gif";
       break;
+    case "jpg":
+      content_type = "image/jpeg";
+      break;
+    case "mp4":
+      content_type = "video/mp4";
+      break;
     default:
       content_type = "text/plain";
   }

templates/post.html

@@ -31,7 +31,7 @@
         <div id="next-post-container">
           <a href="/posts/[[ next_post.slug ]]">Next Post: [[ next_post.title ]]</a>
         </div>
-        [[ endif ]]
+      [[ endif ]]
       [[ component:makoto-styling ]]
     </div>
   </body>