An edit to h1
Re edited h1 tag
Merge branch 'jasons-branch'

Conflicts:
	index.php