Completed Lab

Conflicts:

	client.cpp
	server.cpp