main window generalization
Merge branch 'master' of https://github.com/jmarcinik/srdesign-obsecure-final

Conflicts:
	src/main/java/cs492/obsecurefinal/App.java