Newest GUI and user input class
latest GUI
Integration of Brendan/Lilly work
Adding JUnit Test Framework
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj

Conflicts:
	MyWindow.java