Merge branch 'GUI' of github.com:SeaLions/csc324_dev_proj

Conflicts:
	MyWindow.java
Getting updated.
Merge branch 'GUI' of github.com:SeaLions/csc324_dev_proj into GUI
Merge branch 'GUI' of github.com:SeaLions/csc324_dev_proj into GUI
added/fixed output-file functionality