提交样式
Merge branch 'master' of https://github.com/catxii/2014HR

Conflicts:
	css/style-v1.css
提交样式
提交样式
Merge branch 'master' of https://github.com/catxii/2014HR