commit
Merge branch 'master' of https://github.com/Meds38/cs5651final

Conflicts:
	Networks Final Project/src/Client.java