Update ofTypes per compiler's recommendations
Updated ofTypes.h per compiler's recommendation
Merge branch 'Baccarat' into test