put ruby 2 into our gemfile for heroku and commented out js for carousel
Merge branch 'master' of github.com:eatmorespinach/my_project