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

Conflicts:
	corona/main.lua