cathcing up
Merge branch 'master' of https://github.com/Livpas/ExperimentalMedia

Conflicts:
	people/jhyun103/about.md
	people/mfox2/openFrameworksExamples.md