fixed it
Merge branch 'master' of https://github.com/JesseScott/ofPatternGenerator

Conflicts:

ofPatternGenerator.xcodeproj/project.xcworkspace/xcuserdata/jessescott.x
cuserdatad/UserInterfaceState.xcuserstate