Update README
Merge branch 'master' of https://github.com/djholt/my-awesome-project

Conflicts:
	README.rdoc