Finally have it working okay
Merge branch 'JaredTestGUI'

Conflicts:
	.classpath
	bin/test2.class
	src/test2.java