Local changes in file
Merge branch 'master' of https://github.com/rzenkov/confTest

Conflicts:
	README.md