risky changes
a second change to gittest.txt
possibly conflicting change to gittest.txt
Merge branch 'testing'

Conflicts:
	gittest.txt