search backend works, modified fill_db
merging
Merge branch 'master' of github.com:weshack/study_buddy