Merge branch 'master' of https://github.com/LJMD-OpenCL/ljmd-opencl
Merge branch 'master' of https://github.com/LJMD-OpenCL/ljmd-opencl
Tidy up makefile
Makefiles run software
make clean also deletes generated opencl_kernels_as_string.h
Fixed memory leak in InitOpenCLEnvironment

platforms_list was not being fixed.
Merge remote-tracking branch 'upstream/master'
Keep compatibility with ols make run command
make test now tests difference of outputs from original c code and OpenCL code
Merge pull request #22 from Titan-C/master

New test suite for comparing outputs
Added platform detection

now it is possible to select the platform with the given device type (cpu/gpu)
Merge branch 'master' of https://github.com/LJMD-OpenCL/ljmd-opencl
Correct C version
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from ajasja/master

Added platform detection
Merge remote-tracking branch 'upstream/master' into test

Merging with the latest merge between Oscar and Ajasja

Conflicts:
	test/makefile