Merge branch 'Katie'
Fixed Search, Springs still not connecting
Merge pull request #39 from Kadee80/master

Katie Adee Assignment 2 w.i.p.