Added search implementation, change style for search
Merging with the queen bee
Merge branch 'master' of github.com:echaddock/thrifty