collide work for powerups
Merge branch 'screens' of https://github.com/teamcodeforfood/codecamp13 into screens

Conflicts:
	SpaceshipData.py