thirdcheckin for merge test
'gittest'
'gittest1'
Merge branch 'mergetest'

Conflicts:
	gittest.txt

testing andi