pulling merge
Added select/selectNow implementations. Some formatting.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/PingClient.java
	src/PingMain.java