rspec for search model and controller
devise
conflicts resolved 6/3