a

a
updates
aa

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

Conflicts:
	PonyRace-android/bin/ponyrace-android.jar
	PonyRace/bin/com/tiarsoft/ponyrace/game/GameScreenTileds.class
	PonyRace/bin/com/tiarsoft/ponyrace/game/objetos/Pony.class

PonyRace/bin/com/tiarsoft/ponyrace/game/objetos/TiledMapManagerBox2d.cla
ss