client download torrent alpha
....
...
Merge branch 'master' of github.com:salamanderrex/jtorrent

Conflicts:
	include/Torrent.h