Merge branch 'master' of https://github.com/Eeems/webtorrent
0c96010
Conflicts: bin/cmd.js index.js lib/torrent-manager.js lib/torrent.js
