#10 create restaurant app
#10 create restaurant app
#10 create restaurant app
Merge branch 'master' of github.com:minhuyen/portfolio

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