Added some ignores
Merge branch 'variant1' of https://github.com/mikhail-vnukov/ecotour into variant1
Updated layout
Merge conflicts