Finishing up
Merge branch 'master' of https://github.com/connorclockwise/torrentClient

Conflicts:
	torrentClient.py
Merge branch 'master' of https://github.com/connorclockwise/torrentClient

Conflicts:
	torrentClient.py