Upgraded gems by rebuilding Gemfile.lock file
Merge branch 'master' of https://github.com/jasnow/Practice-Git-with-Rails