cleaning puts staements up
Merge branch 'master' into fix_grocery_list_seed

Conflicts:
	app/models/recipe.rb
Added form the recipe partial
Merge branch 'master' into moved_form_to_recipe_partial
Merge pull request #43 from tararoys/fix_grocery_list_seed

Fix grocery list seed
Merge branch 'master' into moved_form_to_recipe_partial

Conflicts:
	app/controllers/grocerylists_controller.rb
Merge pull request #44 from tararoys/moved_form_to_recipe_partial

Moved form to recipe partial
fixed merged conflict in recipe single view