player
Merge branch 'master' of https://github.com/tdubourg/geobombing

Conflicts:
	corona/game.lua