chged makefile
Merge branch 'LinuxAssign3ChatProgram' of https://github.com/razc411/ridingthecode into LinuxAssign3ChatProgram

Conflicts:
	LinuxAssign3/client/Makefile
	LinuxAssign3/client/src/client_defs.h
added gui for client chat