continuing with last promote
Merge branch 'master' of https://github.com/josephcopenhaver/VNCServer

Conflicts:
	src/com/jcope/vnc/server/ClientHandler.java