nothing much changed
Merge branch 'master' of github.com:alexicon3000/MaterialsIntensity

Conflicts:
	bin/ofxBulletEventsExampleDebug.app/Contents/MacOS/ofxBulletEventsExampleDebug
	src/testApp.cpp