git..
Merge remote-tracking branch 'origin/master'

Conflicts:
	GUITest/src/gui/GUItest.java