still merging...
Merge branch 'master' of git@github.com:RailsWeek2014/CookingWithRuby.git