Have the typing at a good state
Merge branch 'master' of github.com:dcorwin/15237-project1

Conflicts:
	index.html