Moved source branch to master in preparation of moving hosting to Heroku