lets try to commit
Merge branch 'master' of https://github.com/notandrewkaye/testRepo

Conflicts:
	textFile.txt