search controller stuff
Merge branch 'master' of github.com:rainbow-unicorn-rangers/nhshd5