Исправление слияния
Merge branch 'master' of https://github.com/SorokinDmitry/java_and_frontend_project_SDVM