Initial commit
Update Gemfile for Heroku
Merge origin/master -> master