.
.
.
Merge branch 'master' of https://github.com/danielvdwal/AVS_ParkingLot

Conflicts:

AVS_ParkingLot.xcodeproj/project.xcworkspace/xcshareddata/AVS_ParkingLot
.xccheckout
	ParkingLot/ParkingLot.xcodeproj/project.pbxproj