pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_fix
Merge pull request #69 from dbcfoxes2014/search_fix

Search fix