up
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/food.py
	app/miscpages.py
	app/reservation.py
	app/table.py
	config/__pycache__/settings.cpython-34.pyc
	config/__pycache__/urls.cpython-34.pyc
	db.sqlite3
	views/reservation/reservation_success.html