adjustsize
...
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/level.json
	src/com/nju/se/team/mota/game/GameRuntime.java