x
Merge branch 'master' of https://github.com/imkostas/oParking

Conflicts:
	.DS_Store

oParking.xcodeproj/project.xcworkspace/xcuserdata/Stapley.xcuserdatad/Us
erInterfaceState.xcuserstate