getting ready to pull master
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent into Terek

Conflicts:
	bin/pseudoTorrent/PeerProcess.class
Updated host
Updating host