Ver1 added
Ver2
Merge branch 'b1' into b2

Conflicts:
	hello.html