测试冲突
Merge branch 'master' of https://github.com/rspMarie/testproject

Conflicts:
	Academy.cpp