Problemen xcode oplossen
Merge branch 'master' of https://github.com/CharlotteErpels1993/TI3_GC05_Project

Conflicts:

iOS/GC05_iOS/GC05_iOS.xcodeproj/project.xcworkspace/xcuserdata/stefanieg
eldof.xcuserdatad/UserInterfaceState.xcuserstate
	iOS/GC05_iOS/GC05_iOS/Registratie1ViewController.swift