Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
update Gemfile to work on Heroku
update server settings to Heroku
Merge branch 'master' into production
add seed in production
Merge branch 'production'