pushed
Merge branch 'master' of https://github.com/geekism/rtorrent

Conflicts:
	README.md