28/03 14:52
28/03 14:53
Merge branch 'master' of https://github.com/JoonVT/Groep14_MAIV_IFF

Conflicts:
	Groep14_MAIV_IFF.xcodeproj/project.pbxproj
	Groep14_MAIV_IFF.xcworkspace/xcshareddata/Groep14_MAIV_IFF.xccheckout

Groep14_MAIV_IFF.xcworkspace/xcuserdata/VolpeSalvatore.xcuserdatad/UserI
nterfaceState.xcuserstate

Groep14_MAIV_IFF.xcworkspace/xcuserdata/VolpeSalvatore.xcuserdatad/xcdeb
ugger/Breakpoints_v2.xcbkptlist
	Groep14_MAIV_IFF/MapView.m
	Groep14_MAIV_IFF/MapViewController.h
	Groep14_MAIV_IFF/MapViewController.m
	Groep14_MAIV_IFF/UserInTheGameView.m
	Groep14_MAIV_IFF/UserInTheGameViewController.m
	Groep14_MAIV_IFF/UserViewController.m
	Groep14_MAIV_IFF/UsersViewController.m