Readme update
Merge branch 'master' of https://github.com/ilia-novikov/laughing-nemesis

Conflicts:
	README.rdoc
Readme updated