add search, screwed
Merge branch 'master' of https://github.com/sxywu/spinning

Conflicts:
	index.html
	scripts/main.js