commit nr 1
Merge branch 'master' of https://github.com/borisofzerty/main