dicks
testing adding file
testing adding file
testing adding file
-removed clientThread from server class in server package
+worked on client thread.
Merge master into Dev_2

Conflicts:
	.gitignore
	src/Server/ClientThread.java
	src/Server/Server.java
	src/Server/ServerChatroomThread.java
Modified 
	- ClientThread
	- Server
		+ Add testDBConnection