Upgraded gems by rebuilding Gemfile.lock file
Merge branch 'master' of https://github.com/jasnow/sample_app_rails_4
Upgraded Rails to 4.0.8; Rebuilt Gemfile.lock file