collision working better

boiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii #spacewar
Merge branch 'master' of https://github.com/TheCrispy1/Rugger-n-Dunstan2

Conflicts:
	RuggerAndDunstan/spacewar.cpp
invincibility fixed