Outline shader
Merge branch 'master' of github.com:slembcke/Cocos2DShaderCookbook
Merge branch 'master' of github.com:slembcke/Cocos2DShaderCookbook

Conflicts:
	Cocos2DShaderCookbook.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:slembcke/Cocos2DShaderCookbook
Moving some stuff around.
Adding a static shader.
Merge branch 'master' of github.com:slembcke/Cocos2DShaderCookbook

Conflicts:
	Cocos2DShaderCookbook.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:slembcke/Cocos2DShaderCookbook
Cleanup