Fix conflict :(
Merge branch 'master' of https://github.com/minhuyen/portfolio

Conflicts:
	wsgi/restaurant/templates/base.html