adding shit
Merge branch 'master' of https://github.com/leeavital/eat.me

Conflicts:
	flaskr.py