preliminary search stuff
fixed conflict
more search
Merge branch 'master' of github.com:nuxe/Recruiting