trying to get search working
merged with remote
Merge branch 'master' of https://github.com/vgupta0/cs147-final