Main markup
Merge branch 'develop' of github.com:kosmaks/split_city into develop