Fixed threads.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	CharGen/src/edu/wcu/cs/agora/allengriggs/CharGen/ChargenServerDriver.java
	CharGen/src/edu/wcu/cs/agora/allengriggs/CharGen/ChargenTcpServer.java
	CharGen/src/edu/wcu/cs/agora/allengriggs/CharGen/ChargenUdpServer.java
Messed up