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

Conflicts:
	.gitignore

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