added basic search box and tag searching
merge changes
Merge branch 'master' of github.com:RuthRainbow/OSAAT