PJ tried to make 2 protocols do the same thing. why idfk
i did shit
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/ClientThread.java