Merge branch 'master' of https://github.com/justinwalsh/daux.io

composer.json

@@ -13,6 +13,6 @@
     ],
     "require": {
         "php": ">=5.3",
-		"erusev/parsedown": "1.0.0"
+        "erusev/parsedown": "~1.0"
     }
 }