page update
page
Merge branch 'master' of https://github.com/AgonTec/CSC191
Merge branch 'master' of https://github.com/AgonTec/CSC191

Conflicts:
	Senior/user0/manage_act.php