Change the h1
Merge pull request #1 from BigKnell/hoki

Change the h1
Subheading
Merge pull request #2 from BigKnell/subheading

Subheading
conflict
Merge branch 'master' into Dustin

Conflicts:
	 index.html