dicks
testing adding file
testing adding file
testing adding file
-removed clientThread from server class in server package
+worked on client thread.
Modified 
	- ClientThread
		+ worked on Input Thread
		+ Add serverDB method
Merge master into Dev_2

Conflicts:
	.gitignore
	src/Server/ClientThread.java
	src/Server/Server.java
	src/Server/ServerChatroomThread.java
Modified 
	- ClientThread
	- Server
		+ Add testDBConnection
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
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/ClientThread.java
changed server to console only
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/ClientThread.java
adding message error string and boolean
removed login checkboxes autologin and remember login
Merge Dev_2 into Dev_1

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

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

Conflicts:
	src/Server/Server.java
Merge master into Dev_3