Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
move aquisition to getImage()
use single frame mode
Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
Merge remote-tracking branches 'upstream/develop' and 'origin/develop' into develop
Removed required scikits learn import
Added min bounding circle feature
Added to min bounding circle feature
Modified example
looks like there was an indentation error in the keypoints function
findFeatures added
undo changes in drawing layer
Merge pull request #286 from jayrambhia/harris_features

Harris features(corner) and Szeliski features added.
Merge remote-tracking branch 'upstream/develop' into develop
grid feature improved
grid feature improved
docs added
exit() commented
Merge pull request #288 from salil93/grid

Grid method improved
Merge pull request #285 from uprasad/develop

Min Bounding Circle (issue #137)