commiting work so far
Merge branch 'master' of https://github.com/mhweaver/cs471-nmm.git

Conflicts:
	src/main/GUI.java