first commit
Gemfile version control
Deploying to Heroku
Fixing merge conflicts.
Fixing more merge conflicts.