Merge branch 'hack4mn'
change to Gemfile to work with Heroku
commit with conflicting Gemfile.lock