Merge Dev_2 into Dev_1

Conflicts:
	src/Server/Server.java
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/Server.java
i did shit
PJ tried to make 2 protocols do the same thing. why idfk