Merge branch 'master' into branch1
hh
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	myfirstHello.txt
commit