初始化
Merge branch 'master' of https://git.oschina.net/xmx0632/management

Conflicts:
	.gitignore