m:n relation between category and recipe added
Merge branch 'master' of
git@github.com:RailsWeek2014/CookingWithRuby.git

Conflicts:
	app/views/recipes/_recipe_form.html.erb