Now working on GPU, but not in CPU
Merge branch 'master' of https://github.com/gagallo7/OpenCLStudy

Conflicts:
	ift-demo/demo/watershed2/dijkstra.cl
	ift-demo/demo/watershed2/flower_result.ppm
	ift-demo/demo/watershed2/watershed
	ift-demo/demo/watershed2/watershed.c