Scale-Invariant Feature Transform --> work
Merge branch 'master' of https://github.com/NPTricky/img-classification-ss13

Conflicts:
	samael/ComputationManager.cpp
	samael/ComputationManager.h