modified:   CHANGELOG.md
	modified:   README.md
Merge branch 'master' of github.com:hrr888/mytest-cookbook

Conflicts:
	README.md