Modified search
Merge branch 'master' of github.com:maviskay/291Project1