TESTMT-1

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

Conflicts:
	README.md
Merge branch 'master' into mtrimmer
TESTMT-1
Looking for another conflict
TESTMT-1
Merge branch 'mtrimmer' of github.com:inmar/testing into mtrimmer
Conflicts:
	file_test.txt