Merge branch 'master' of https://github.com/leha2323/gita

Conflicts:
test.txt
commit