21 merge
21 merge
Merge branch 'master' of https://github.com/NikitaYakuntsev/algebra

merge khateev
commit 21