search results working
Merge branch 'master' of https://github.com/jy2012/flashback-170