sync
Merge branch 'master' of https://github.com/jackflips/Protest

Conflicts:

Protest.xcodeproj/project.xcworkspace/xcuserdata/johnrogers.xcuserdatad/
UserInterfaceState.xcuserstate