xcode config
Merge branch 'master' of https://github.com/edWAR6/Progendo

Conflicts:

Quetidin/quetidin.xcodeproj/project.xcworkspace/xcuserdata/edWAR6.xcuser
datad/UserInterfaceState.xcuserstate