部分信息修改的写好了
Merge branch 'master' of https://github.com/CatalystDP/acm

Conflicts:
	acm/html/page/info/index.php
个人信息修改