Readme edited#
Merge branch 'ChrisK'

Conflicts:
	README.md