Enfin les collisions !!!!
Merge branch 'master' of
https://github.com/MisterMikis/FlamingAdventure.git

Conflicts:
	FlamingAdventure/bin/FlamingAdventure.apk