testing from vm-mac
Merge branch 'master' of https://github.com/ykbarros/TestRepo

Conflicts:
	README.md
deleted README