updated the readme of the master branch
updated master
added a line to master
updated child
updated master
Merge branch 'master' into child

Conflicts:
	readme