just a test commit
Merge branch 'master' of https://github.com/graeme-hill/hello_edoc

Conflicts:
	README.md