added an h1 tag
added an h2 tag
added a paragraph tag
changed content of the paragraph tag
Merge branch 'editing_header'
Merge branch 'origin/master'

Conflicts:
	_work/site_working_structure.html