Merge branch 'master' of https://github.com/BowenChan/CS-174-Website-Project

Conflicts:
	login.php