Fix: Merge conflicts with search branch
Merge branch 'master' of https://github.com/juanpujol/cinema-overflow