derp
Merge branch 'master' of github.com:ivanvmel/Torrent

merge conflict

Conflicts:
	README.md