Stuff
Merge branch 'master' of github.com:arlininger/java_gui_class