develop
Resolve merge conflicts in Main.qml between feature/buttonsize and develop
добавил гит игнор (много жалоб уже)