window fixed
Merge branch 'master' of github.com:cytms/java-final-project

Conflicts:
	bin/Panel.class
merge