Initial commit
[67723050] Setting up environment
Merge branch 'master' into heroku/master