many attempts to get smth workin but inefficient
working descriptors, refactoring
refactoring descriptors computation [NOT Working]
More debugging
Working on it, still not working
Finally, a working parallel version of descriptor computation
Descriptors OK -- keypoints should be compacted before computing descriptors
Merge remote branch 'origin/master'
Merge remote branch 'pierre/master'

Conflicts:
	openCL/keypoints.cl