broke gemfile
Merge branch 'master' of https://github.com/travispence/Final_Project