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

Conflicts:
	Gdx002-android/assets/data/map/teaching.tmx
11
55
99