Initial commit
Adding a config file for prose.io to test media uploads
Merge branch 'master' into gh-pages