refactor index.js
Merge branch 'master' of https://github.com/gabrielyeung/workshop

Conflicts:
	www/js/index.js