Added headers for macOSX compilation in include/OpenCL_utils.h
Modified makefile in order to identify OS and define conditional flags/libraries
Resolving conflicts with makefile
Merge remote-tracking branch 'upstream/master'
   Conflict resolved for the OPENCL_PATH variable
Conflicts:
	makefile
Merge pull request #31 from jmsolano/master

Added headers for macOSX compilation in include/OpenCL_utils.h
solve