I like hotdogs
I like cheese dogs
Merge branch 'hotdog'

Conflicts:
	pizza.html