TESTMT-1

This is a github commit
TESTMT-1

Fixing issue noted in pull request
Merge branch 'master' into mtrimmer
TESTMT-1
Looking for another conflict
TESTMT-1

LKJLSJDf
TESTMT-1
Merge branch 'mtrimmer' of github.com:inmar/testing into mtrimmer
Conflicts:
	file_test.txt
Merge pull request #2 from inmar/mtrimmer

Mtrimmer