Merge remote-tracking branch 'origin/master'

Conflicts:
	login.php
regi fix
random
Merge branch 'master' of https://github.com/BowenChan/CS-174-Website-Project