added scipi
Merge branch 'master' of https://github.com/katiecanada/cs221Project
surf/sift experimentation
nearest neighbour stuff