This works Jixiang...
Merge branch 'master' of https://github.com/mibewh/seniorProject.git

Conflicts:
	Senior Project/src/wzh/game/level/Main.java