To run, execute the util.TestDriver class
Killing redundant class ServerTrackerSwingApplication
Cleaning up extra imports
Commiting
Commiting
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/omorley/ServerTracker.git
into day7

Conflicts:
	src/ca/bcit/comp2613/servertracker/model/ServerTrackerCabinetSwingApplication.java
	src/ca/bcit/comp2613/servertracker/model/SwingServerTrackerModel.java
	src/changes.html