changed h1
Merge branch 'master' of https://github.com/drstearns/team-dev-demo-a

Conflicts:
	index.html

fixed merge conflict