Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'
+ not_used
+ jsmidi
Merge remote-tracking branch 'upstream/master'
+ app
+ addons
Merge branch 'original_master' into bb_master
+ apps
+ ofxFFt change
Merge branch 'original_master' into bb_master
Merge remote-tracking branch 'original_oF/master' into bb_master
/ jdksmidi folder move
+ ofxFenster src
+ geom
Merge branch 'original_master' into bb_master
+ change commit
Merge commit '62ed634fcf707957f64f0d6614b2313eef2a3b7b' into bb_master

Conflicts:
	apps/projectGenerator/projectGeneratorSimple
Merge branch 'master' of https://github.com/openframeworks/openFrameworks into original_master
Merge branch 'original_master' into bb_master
+ check