Simple window added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Star/Client.java