updates
Merge branch 'master' of https://github.com/matthillman/Ratio

Conflicts:

Ratio.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInte
rfaceState.xcuserstate