Third commit to local repository.
Merge branch 'master' of https://github.com/jim-bailey/RepoTesting

Conflicts:
	testfile.txt