add another test
Merge branch 'master' into testing
	modified:   tested.txt
	modified:   a.txt
	modified:   a.txt
Merge branch 'testing'

Conflicts:
	a.txt

	modified:   a.txt