此版废除
Merge branch 'master' of github.com:kanon1109/tiledMap

Conflicts:
	src/TiledMap.as