thomas1 stuff begins here
thomas1 one
thomas1.two
thomas1.three
(adding a line here on master)
Merge branch 'master' of https://github.com/trbm/RebaseExperiments

Conflicts:
	TestFile.txt