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

Conflicts:
	.gitignore