Add test1,test2
Merge branch 'B1'

Conflicts:
	tjoho.txt