merge from fisch0920
Merge branch 'master' of https://github.com/Eeems/webtorrent

Conflicts:
	bin/cmd.js
	index.js
	lib/torrent-manager.js
	lib/torrent.js