put in paths
Merge branch 'master' of github.com:sxywu/spinning

Conflicts:
	index.html
	scripts/main.js