make a conflict
make another conflict
make another conflict
h1
dark blue
revert
Merge branch 'conflict_1'

Conflicts:
	Roses.html
Merge branch 'conflict_2'

Conflicts:
	Roses.html
poem
Merge pull request #1 from PeterBloom/poem_branch

Poem branch