week4 home fixed
Merge branch 'master' of https://github.com/presly808/ACP3

Conflicts:
	src/yaroslav/multiChat/Server.java