commit A
commit B
commit C
Revert "commit B"

This reverts commit 7df1a8288e9d05fd2080121ac9eedabcb4112183.

Conflicts:
	test.html
commit D