test with many_and_belongs_to
migration file missing ;)
Merge branch 'testing'

Conflicts:
	Gemfile
	app/controllers/recipes_controller.rb
	app/models/recipe.rb
	app/views/recipes/_recipe_form_for_categories.html.erb