animal
Merge branch 'master' of https://github.com/Beardstorm/Grupp2ZooUppgift

Conflicts:
	bin/Animals/Animal.class