elephant
Revert "elephant"

This reverts commit c0320c28470d1c34cdc2fd41000a9a4a13ffce53.
elephant
Merge branch 'master' of https://github.com/Beardstorm/Grupp2ZooUppgift
Merge branch 'master' of https://github.com/Beardstorm/Grupp2ZooUppgift