reservation page #14
Merge branch 'master' of https://github.com/minhuyen/portfolio

Conflicts:
	wsgi/restaurant/static/css/main.css