refined GUI, further refinements to follow
Merge branch 'master' of https://github.com/liddictm/cs355team14

Conflicts:
	project3/src/gui_rough_draft/gui.java