Updated README
Merge branch 'master' of https://github.com/shellhead/org-docs

Conflicts:
	README.org