a

a
Merge branch 'master' of https://github.com/tiarsoft/PonyRace-P

Conflicts:
	PonyRace/bin/com/tiarsoft/ponyrace/game/WorldTiledRenderer.class
	PonyRace/bin/com/tiarsoft/ponyrace/game/objetos/PonyMalo.class