merge problem with gemfile.lock
add Gemfile.lock to .gitignore
Merge branch 'master' of github.com:RailsWeek2014/CookingWithRuby