Classes Living
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Classes/Living/Animal.cs