modify david branch
Merge branch 'david'

Conflicts:
	index.html