Merge branch 'master' of github.com:BensonKuo/FOODem

Conflicts:
	index.html
delete wrong
whatQQ
delete wrong