pretty html
pretty html

Conflicts:
	index.html
pretty html
why cant i fix this conflict