First version of calculating Ingredients required in one week
Merge branch 'master' of git@github.com:RailsWeek2014/CookingWithRuby.git
User role now defaults to "u"
Merge branch 'master' of git@github.com:RailsWeek2014/CookingWithRuby.git