Merge branch 'master' of github.com:atatuev/testr

Conflicts:
	README.md
test commit
Merge branch 'master' of github.com:atatuev/testr

Conflicts:
	README.md