maybe last one for me
Merge branch 'master' of https://github.com/jskinny/videoProjectforFly

Conflicts:

myFunSketch/myFunSketch.xcodeproj/project.xcworkspace/xcuserdata/jamescl
otfelter.xcuserdatad/UserInterfaceState.xcuserstate