bundle install
Merge branch 'heroku'
style up