minor changes
Merge branch 'master' of github.com:jimqi/CPSC-304-Project

Conflicts:
	script.js

merge
Merge branch 'master' of github.com:jimqi/CPSC-304-Project

Conflicts:
	login.php

merge