123
Merge branch 'master' of github.com:icemanstudy/shike_new

Conflicts:
	.idea/workspace.xml
完成学生首页.上传切图资源