Added SURF descriptor extractor.
Merge branch 'master' of github.com:prblaes/ImageColorization

Conflicts:
	colorizer/colorizer.py