Adding animals to environments
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab3/character/user.cpp
	lab3/main.cpp