смотрим козу
Merge branch 'master' of https://github.com/SkyerAL/gitflow.example

Conflicts:
	example_git/example_git/Program.cs