Added text to foo.txt
Made changes again and to the master branch
Merge branch 'testing'

Conflicts:
	foo.txt