Options menu

NOW WITH FUN COLORS!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Game/src/com/thecolony/tractus/networking/ClientMain.java
Merge branch 'master' of https://github.com/CS-196-Space-Colonization/Game