update works
Merge branch 'master' of
git@github.com:RailsWeek2014/CookingWithRuby.git

Conflicts:
	config/routes.rb