mijn
Merge branch 'tijdelijk'
kjkj
Merge branch 'master' of https://github.com/hcoppen/MyXCodeTest

Conflicts:

BlockAlertsDemo.xcodeproj/project.xcworkspace/xcuserdata/hcoppen.xcuserd
atad/UserInterfaceState.xcuserstate