search servlet update
Merge branch 'master' of https://github.com/EricOng/SJSU-CS160-SurpriseError