Response to issue 4 on Github
Merge branch 'master' of github.com:lazzarello/instiki-heroku