Merge branch 'master' into production
Merge branch 'master' of heroku.com:summer-bike-challenge-prod into production