got search bar up and running
Merge branch 'master' into profile