delete files
fix bug
Merge branch 'master' of github.com:Hao8816/coco

Conflicts:
	app.js
fix bug