updated with rails_12factor
deleted gemfile.lock
Merge branch 'master' of https://github.com/Katzy/msjtourney