d
Merge branch 'master' of https://github.com/fueg0/phase0

Conflicts:

TaskBenderizm/TaskBenderizm.xcodeproj/project.xcworkspace/xcuserdata/fue
g0.xcuserdatad/UserInterfaceState.xcuserstate

TaskHuman/TaskHuman.xcodeproj/project.xcworkspace/xcuserdata/fueg0.xcuse
rdatad/UserInterfaceState.xcuserstate