Merge pull request #1 from SlaffM/my_feature

my  feature
Merge pull request #2 from SlaffM/my_feature

My feature
Merge pull request #3 from SlaffM/dev

Merge pull request #1 from SlaffM/my_feature
Merge pull request #4 from SlaffM/master

m
Merge branches 'dev', 'master' and 'my_feature' of https://github.com/SlaffM/modzhuk into my_feature
my  feature