as customer whants
Merge branch 'master' of https://github.com/linkelf/gitflow.example

Conflicts:
	Animals/Program.cs