Now short works correctly for port numbers over 32000
Merge remote-tracking branch 'origin/master'

Conflicts:
	EchoLab/src/com/cs413/EchoClient.java