update index.js
Merge branch 'master' of https://github.com/azzip/test

Conflicts:
	js/index.js