Resolve merge conflicts

3 files changed, 4 insertions, 6 deletions

diff --git a/README.md b/README.md
index e6d09ff..d8d0f6f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The assets are minified and combined using [Grunt](http://gruntjs.com/).
 Assuming you already have Node and NPM working, compilation is easy. Use the
 following shell code:
 
-#### Apache
+## Apache
 If you are running Apache and want to compress your output when serving files, add to your `.htaccess` file:
 =======
 ```
@@ -56,8 +56,6 @@ configuration file.
 * Clean up Moe code, a lot..
 * API keys?
 
-## Contact
-I can be contacted via hostmaster@pantsu.cat.
 =======
 ## License
 
@@ -67,3 +65,4 @@ license. See LICENSE.
 ## Contact
 
 The maintainer can be contacted via hostmaster@pantsu.cat.
+
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..89690f7
--- /dev/null
+++ b/dist.zip
diff --git a/static/classes/Response.class.php b/static/classes/Response.class.php
index b7e4c5d..c340a4c 100755
--- a/static/classes/Response.class.php
+++ b/static/classes/Response.class.php
@@ -16,8 +16,7 @@ class Response
                 header('Content-Type: text/plain; charset=UTF-8');
                 $this->type = $response_type;
                 break;
-
-            case 'html':
+            case 'html': 
                 header('Content-Type: text/html;charset=utf-8');
                 $this->type = 'html';
                 break;
@@ -129,7 +128,7 @@ class Response
     private static function html_success($files)
     {
         foreach ($files as $file) {
-            $result .=  '<a href="'.$file['url'].'">'.$file['url'].'</a><br>';
+            $result .=  "<a href=\"".$file['url']."\">".$file['url']."</a><br>";
         }
 
         return $result;