changes
Merge https://github.com/Brian-Black/DinnerTrackingGuide
altered templates again
fixed bugs from the merge