Added the create route for user_recipes and updated the user_recipes controller
Merge branch 'master' into add_recipe_to_weekly_schedule
Finished adding a recipe to a Weekly schedule.  Strong parameters not included.
Cleaned up the recipe view .
Working on implementing the form_for in the user_recipes view
Merge pull request #31 from tararoys/nutrition_information

Nutrition information
Attempt to get the gemifile.lock to stop asking to be committed
User can add favorites on main search page
User can add favorites on filtered search page
Merge branch 'master' into add_recipe_to_weekly_schedule

Conflicts:
	app/controllers/scheduled_recipes_controller.rb
	app/views/recipes/show.html.erb
Merge branch 'master' into TLR-favorite-recipes

Conflicts:
	app/views/recipes/index.html.erb
	app/views/welcome/index.html.erb

Extracted add and favorite code into the brand new partial that
appeared.  Yay for less code duplication!
Merge pull request #32 from tararoys/TLR-favorite-recipes

Tlr favorite recipes
Merge branch 'master' into nutrition_information
BUGFIX:  user recipes page now displays

When we extracted the recipes display logic into an application
partial, it broke the code in users_recipes controller.
Specifically, the User recipes controller was senting the partial
the instance variable @user_recipes, and the partial was expecting
an instance variable named @recipes, so all of my recipes broke.

It now displayes correctly.
Merge pull request #33 from tararoys/TLR-user-recipes-page-bugfix

BUGFIX:  user recipes page now displays
Working on adding the form_tag
Merge branch 'master' into add_recipe_to_weekly_schedule
Form_tag is functioning correctly and will add a recipe to the weekly schedule!
Merge pull request #34 from tararoys/add_recipe_to_weekly_schedule

Add recipe to weekly schedule
adds an check for end of file reached error to retry JSON parsing