Changing master some more
Merge branch 'TestBranch1'

Conflicts:
	My File 2.txt
	My File.txt
Adding 6 and 7