Still working...
Merge branch 'master' into fixing_scheduled_recipes_controller
Moved UserRecipes create to the ScheduledRecipes controller
Merge pull request #56 from tararoys/fixing_scheduled_recipes_controller

Fixing scheduled recipes controller
updated nutrition info migration file with usda field types
Merge pull request #57 from tararoys/cjo_nut_info_migration

updated nutrition info migration file with usda field types
Merge branch 'master' into TLR-test-user-collects-recipe-and-adds-it-to-my-week