Usage example
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	src/main/java/org/aotorrent/client/SingleTorrentClient.java