Merge branch 'new_master' into search
added some more search robustness
Merge branch 'search' of https://github.com/shsiung/CS121-LicensePlate into search
Modified search a little bit
output conflicts...no fix