Actualización del fork de Aluizio
Merge branch 'master' of https://github.com/aluizioneto/chinoPinball

Conflicts:

ofxBulletEventsExample.xcodeproj/project.xcworkspace/xcuserdata/aluizio.
xcuserdatad/UserInterfaceState.xcuserstate