ok
gitgnore
Merge branch 'ivan'