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

Conflicts:
	OPPannig 2/OPPannig/en.lproj/MainStoryboard.storyboard
	OPPannig 2/OPPannig/memeViewController.h
	OPPannig 2/OPPannig/memeViewController.m
	OPPannig
2/oParking.xcodeproj/project.xcworkspace/xcuserdata/Stapley.xcuserdatad/
UserInterfaceState.xcuserstate
Revert "Merge branch 'master' of https://github.com/imkostas/oParking"

This reverts commit 524e0eef4ed755b994459363e167f9bc0652d8b8.
Revert "stup 2"

This reverts commit 588b9dbd16521b138f5afcc973a5076192f134f2.