:
updating to head
merge conflights
Merge branch 'master' of https://github.com/openframeworks/openFrameworks
updating again
updating tutorial a bit
adding actual tutorial
spelling Lukasz's name right :/
fixed some typos
Merge pull request #1 from julapy/OF_joshuajnoble_shader_branch

fixed some typos in shader tutorial.