Much headache
Adding Mike's work...
What a mess.

Git says:
Merge branch 'test2' of https://github.com/VSGP2014/viope_space_game

Conflicts:
	src/main/Creator.java
	src/main/MainMenu.java