macbook commit
Merge branch 'master' of github.com:mvadim-/IF-city