make test now compares results of OpenMP version of original code, OpenCL version in cpu & OpenMP-OpenCl version against original version results
Merge remote-tracking branch 'upstream/master' into tester

Conflicts:
	makefile
	test/makefile