broken test in SIFT... resolved
Merge remote-tracking branches 'upstream/develop' and 'origin/develop' into develop
ColorMap class improved
ColorMap Class improved
SURFTracker added
Merge pull request #292 from jayrambhia/siftkeypoint_test

Broken matchSIFTKeyPoints(in OpenCV < 2.4.3) resolved
URL modified
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop
Merge pull request #297 from sushilthe/tutorial

URL modified
Merge pull request #296 from jayrambhia/SURFTracker

SURF Tracker
Merge pull request #294 from salil93/color_map

Color Map Class improved
added print to confusion matrix