Merge branch 'master' of https://github.com/stigor/my_git into develop
Merge branch 'hotfix/0.2'
Merge branch 'master' of https://github.com/stigor/my_git into develop
tte
Merge branch 'develop' of https://github.com/stigor/my_git into develop

Conflicts:
	file2