Merge master into Dev_2
idk

Conflicts:
	.gitignore
	src/Server/ClientThread.java
	src/Server/Server.java
	src/Server/ServerChatroomThread.java
Merge master into Dev_2
idk

Conflicts:
	.gitignore
	src/Server/ClientThread.java
	src/Server/Server.java
	src/Server/ServerChatroomThread.java