code convetions implemented
asd
Merge branch 'master' of https://github.com/Kostyan1488/testing-git
Merge remote-tracking branch 'remotes/origin/trofym'
Merge remote-tracking branch 'remotes/origin/trofym'