gui works
Merge branch 'master' of
https://github.com/stevesdawg/ATCSGroupProjects.git

Conflicts:
	ChatClient/.classpath