updated version
q
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/index_admin.php
	admin/manage_users.php
	index.php
merge?
Merge branch 'master' of https://github.com/BaiXF/CS2102