Still not looking right, but so much better
Merge origin/master

Conflicts:
	src/stargaze/window.java