trying to get rails 4.0 to work with heroku
Merge branch 'master' of https://github.com/CUchack/Final_Project