first commit
Merge branch 'master' into adding_button_to_delete_recipe_from_week_schedule
Link added to My Week view
A User can now delete a recipe from their Weekly Schedule
Merge pull request #40 from tararoys/fix_grocery_list_seed

Fix grocery list seed, looks good!
Merge branch 'master' into adding_button_to_delete_recipe_from_week_schedule
Fixed a naming error in the _recipe_list partial
Merge pull request #41 from tararoys/fixed_naming_error_on_recipes_partial

Fixed naming error on recipes partial
udpated form helper tags so form has proper html and just one submit button
search is working
Merge pull request #42 from tararoys/cjo_search_form

Cjo search form
Update application.html.erb

removed my params.inspect code i had accidentally left in the layout file
cleaning puts staements up
Merge branch 'master' into fix_grocery_list_seed

Conflicts:
	app/models/recipe.rb