syncing everything for me
Merge branch 'master' of https://github.com/Brian-Black/DinnerTrackingGuide

Conflicts:
	__init__.pyc