mY COMMIT YAY
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	apps/ofTest/mySketch/src/testApp.cpp
	apps/ofTest/mySketch/src/testApp.h
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	apps/ofTest/mySketch/src/testApp.cpp
	apps/ofTest/mySketch/src/testApp.h
Latest commint, merge went a bit bad, some code might be missing but the app works