database n stuff
Merge branch 'master' of github.com:ElliotSchmelliot/Foodleator

Conflicts:
	Foodleator/Web.config