test
Merge branch 'master' of https://github.com/injektoxa/Animals.git
e
Merge branch 'master' of https://github.com/injektoxa/Animals

Conflicts:
	Animals/Web.Deploy-dev.config