merge
Merge branch 'master' of https://github.com/Brian-Black/DinnerTrackingGuide

Conflicts:
	__init__.pyc
	config.py
	models.pyc
	views.pyc
basic functionality restored