First whack at hello window
Merge origin/master

Conflicts:
	src/HelloWindow.java