Streamlining
Merge branch 'master' of https://github.com/AdamDeHovitz/Empire

Conflicts:
	Game.class