m key
Merge branch 'master' of https://github.com/jskinny/videoProjectforFly

Conflicts:
	myFunSketch/src/testApp.cpp