Rollback layermap, explosions when asteroid hits player
Merge branch 'master' of https://github.com/mpmitchell/GP1-coursework

Conflicts:
	scene.cpp