a

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

Conflicts:

PonyRace/bin/com/tiarsoft/ponyrace/game/WorldTiled$plataformasContact.cl
ass
	PonyRace/bin/com/tiarsoft/ponyrace/game/WorldTiled.class