Animation work
Fixed Screen Problems
Animated Space and Collide Function implemented
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/teamoxygen/spacetraders/view/CharacterCreationController.java