Added Planner and made changes to Ingredient
Merge remote-tracking branch 'origin/master'
New stuff bin and gen