Readme changed again
Merge branch 'readme' into liber

Conflicts:
	README.rdoc