big time search bar changes, yo
fixed merge
Merge branch 'master' of github.com:s-mcqueen/granite
merge