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

Conflicts:
	MyWindow.java
Getting updated.
Adding JUnit Test Framework
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj

Conflicts:
	MyWindow.java
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj

Conflicts:
	MyWindow.java
Merge branch 'master' of github.com:SeaLions/csc324_dev_proj
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
Made it look pretty; added simple status display for user.
removing extraneous file
ACTUALLY making it pretty this time
Adding a pin to output kml for demo purposes.
Adding a pin to the kml.
Minor change.
merging
fixing merge conflicts.
finishing merge to master (still...)
Adding intial JUnit framework
Adding intial JUnit framework