Implemented basic collision detection. Makes me so sad.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Objects/ship.py
	src/Scene/combatScene.py
Changed back to resizable for now.
Merge remote-tracking branch 'origin/master'