test commit test repo2
Merge remote-tracking branch 'testrepo2.git/master' into master2

Conflicts:
	init