I implemented the chat feature into the main student GUI. I left the
layout of the pdf and the chat to you Lauren.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	src/Network/Client.java
	src/Network/Server.java
	src/Network/ServerThread.java