search form changes
merge conflict
merge done
Merge branch 'master' of https://github.com/mvthen/NYMovies