Added first attempt at collision detection
Merge branch 'master' of https://github.com/micke-b/RocketLander

Conflicts:
	RLander/level1.lua