master1
issue1
issue2
issue2-a
Merge branch 'issue1'

Conflicts:
	test.html
Merge branch 'issue2'

Conflicts:
	test.html
Merge branch 'issue2-a'

Conflicts:
	test.html