add javascript commit
Update index.html

pull test
Merge remote branch 'origin/javascript'

Conflicts:
	index.html