Modding the gitignore to ignore the .plist files under Mac OS X
Merge branch 'master' of https://github.com/HandsOnOpenCL/Exercises-Solutions

Conflicts:
	.gitignore
Update err_code.c to return string not printf error
Merge branch 'master' of github.com:HandsOnOpenCL/Exercises-Solutions
Merge branch 'master' into gameoflife

Conflicts:
	.gitignore