handle the conflict
Merge branch 'activity_center' of https://github.com/Demonsu/NjuVolunteer.git into activity_center

Conflicts:
	public/act.php

Signed-off-by: Demonsu <245681117@qq.com>
Merge pull request #3 from Demonsu/activity_center

Wang Yaojing:index and act
It is ok after my long time debugging!