Integrated CanCanCan in all Controllers
Merge branch 'master' of
git@github.com:RailsWeek2014/CookingWithRuby.git

Conflicts:
	app/controllers/recipes_controller.rb
	app/views/comments/_comment_text.html.erb