%%
Merge branch 'master' of https://github.com/winday0215/COP5725

Conflicts:
	restaurant/signin.html