fix merge
fix merge
Merge branch 'master' of https://github.com/pprmint/cheetos
added search new
Merge branch 'master' of https://github.com/pprmint/cheetos