Update Gemfile.lock for Heroku
finishing demo app
Merge branch 'master' of https://github.com/ericmanlol/rails4_testapp

forgot i edited the readme earlier, merging then commit