Update README
Merge pull request #1 from strika/master

Update README
Merge pull request #2 from strika/master

Remove README.rdoc
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md