Merging
Merge branch 'master' of https://github.com/travpurc/CSCE-438-HW3

Conflicts:
	GUI.py