修改为MVC。。
Merge branch 'master' of https://github.com/HazelChen/newBrand.git

Conflicts:
	stave/src/data/note/Modifier.java