search basic sunspot
Merge branch 'master' of https://github.com/carinaboo/homie
update search sunspot
Merge branch 'master' of https://github.com/carinaboo/homie
finished reimplementation of search
resolved search conflict