yup
efef
Merge branch 'master' of https://github.com/natecope/MatBorderCalculator

Conflicts:

MatBorderCalculator.xcodeproj/project.xcworkspace/xcuserdata/ncope.xcuse
rdatad/UserInterfaceState.xcuserstate