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....
im so sick of this fucking project