lots
Merge branch 'master' of https://github.com/jackhinman/GitTest1

Conflicts:
	index.html