哦哦
Merge branch 'master' of https://github.com/sorcerer310/Bsugdx002

Conflicts:
	Gdx002/src/com/bsu/obj/Player.java