reduce some files
Merge branch 'master' of https://github.com/cJamey/pinkpopo

Conflicts:
	webtest/new.sh
	webtest/vote.js