misc
Merge branch 'master' of https://github.com/martinchristov/kidamomtv
finishing search
merged conflicts