changed gemfile
gemfile changed
merge conflicts fixed, post hackathon commit
merge commits fixed