Got the spaceships moving and bouncing around
Merged everything from Alissa's branch into master