Fixed some mistakes and worked on the Client class.

Close to done with part one of the lab, hopefully (if it works).
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.java