commit
commit js
Merge remote-tracking branch 'origin/js-test'

Conflicts:
	index.html
gains