TESTMT-1
Trying to cause a conflict
Merge branch 'master' of github.com:inmar/testing

Conflicts:
	README.md