Merge pull request #1 from ChinosInternationalCC/master

Actualización del fork de Aluizio
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
.
Merge branch 'master' of https://github.com/ChinosInternationalCC/chinoPinball into ChinosInternationalCC-master

Conflicts:
	chinoPinball.xcodeproj/project.pbxproj
Merge pull request #11 from aluizioneto/ChinosInternationalCC-master

Chinos international cc master