Change from local.
Merge branch 'master' of https://github.com/jheines/project1

Conflicts:
	index.html