pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into debug
fixed conflicts
searching just vide0/images will not break
Merge pull request #155 from dbcfoxes2014/debug

Debug