server shutdown no longer borked
Merge branch 'master' of https://github.com/eldanielo/danirepo

Conflicts:
	03/src/auctionsys/TCPListenThread.java