Changed string comparison to correct one.
Fix #3.
Deleted clientGUI folder.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/.idea/workspace.xml