changed content
Merge branch 'master' into js-test

Conflicts:
	index.html
Merge branch 'js-test'