Bug fixes, refactoring
Merge branch 'master' of https://github.com/chy/CNTorrent

Conflicts:
	src/peers/Peer.java
Merge branch 'master' of https://github.com/chy/CNTorrent

Conflicts:
	src/peers/Peer.java