project
Merge branch 'master' of https://github.com/dylansturg/openclraytracer

Conflicts:
	ParallelSumOpenCL/ParallelSumOpenCL/ParallelSumOpenCL.vcxproj
	ParallelSumOpenCL/ParallelSumOpenCL/ParallelSumOpenCL.vcxproj.filters
1