had to fix merge conflict in gem file think it still works
clearing migration file conflict and gemfile conflict
precompile
Merge branch 'master' of heroku.com:ratemylunch
adding ruby version to gemfile
Merge branch 'development'
changing ruby v
precompile
add company id to user sign up form