Extract Universe
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameModel.java
Merge branch 'master' of https://github.com/teamtyn/spacetrader