diff ver.2
Merge branch 'master' of https://github.com/NullException/big_brother_parking