commit after submitting the design document 12/14
i forgot what i did.  but  i did something
Merge Dev_2 into Dev_1
Merge Dev_2 into Dev_1

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

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

Conflicts:
	src/Server/Server.java
almost done with clientThread
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
i did shit
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/ClientThread.java
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....
im so sick of this fucking project
Fuck Yeahhhhhhhhhhhhhhhh 
Finished Server... I think....