chatclient
Merge branch 'master' of https://github.com/AlecZadikian9001/Chat-System-BlueJ

Conflicts:
	project/Common/package.bluej
	project/Server/package.bluej
	project/package.bluej
chatclient2
adfs