updating ofVideoPlayer
Merge branch 'master' of https://github.com/openframeworks/ofSite
tweaking twitter
Merge pull request #190 from lmccart/master

tweaking twitter
updated documentation for ofPixels and ofImage functions
Merge remote-tracking branch 'upstream/master'
Merge pull request #189 from csugrue/master

non-documented indicated by gray > before function,var,method name
Fixed broken OpenCV link

Link contained the protocol ("http://") twice.
Fixed broken OpenCV link
Merge pull request #191 from Garmine/patch-1

Fixed broken OpenCV link
added logos and descriptive text for major sponsors of openFrameworks
Merge pull request #195 from joshuajnoble/master

adding shader tutorial, yippee!
adding tutorial
Merge pull request #196 from joshuajnoble/master

actually adding tutorial
added survey template page
Merge branch 'master' of github.com:openframeworks/ofSite
dataviz images for survey results
Initial pass at adding text and images
resized images
Merge branch 'master' of https://github.com/openframeworks/ofSite