Merge branch 'master' of https://github.com/ms8/ms8

Conflicts:
	     修改首页
Merge branch 'master' of https://github.com/ms8/ms8

Conflicts:
	     修改首页
Merge branch 'master' of https://github.com/ms8/ms8
Merge branch 'master' of https://github.com/ms8/ms8
Merge branch 'master' of https://github.com/ms8/ms8

Conflicts:
	     修改首页