Merge branch 'master' of https://github.com/blueworrybear/OpenCLvSwitch

Conflicts:
Document/opencl_tutorial.txt
Modify gramma
fix