cleaning puts staements up
Merge branch 'master' into fix_grocery_list_seed

Conflicts:
	app/models/recipe.rb
Merge pull request #43 from tararoys/fix_grocery_list_seed

Fix grocery list seed