Did some more testing once ther server came back online, optimized some portions of the search code
Merge branch 'master' of github.com:cserafin/CMPUT301W13T14