.
Merge branch 'master' into fixing_search

Conflicts:
	app/controllers/recipes_controller.rb
Merge pull request #87 from tararoys/fixing_search

Fixing search