merge up
Merge branch 'master' of https://github.com/DavidDeSimone/RUBTClient.git

Conflicts:
	src/com/ddsc/networking/TorrentState.java
more peer
Merge branch 'master' of https://github.com/DavidDeSimone/RUBTClient.git

Conflicts:
	src/com/ddsc/networking/TorrentState.java
peer
fixup