added text- i dont get it
maybe i get it now
Merge branch 'js-test'

Conflicts:
	index.html