Fixed random bug
Merge branch 'master' of github.com:emilenovv/ZooTeamwork