Merge conflicts
Merge branch 'master' of https://github.com/chy/CNTorrent

Conflicts:
	src/messages/Handshake.java