Added auto search back in, doesn't really look good
Merge branch 'master' of https://github.com/andylamb/cs147-project-2