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

Conflicts:
	src/Animals/Animal.java
	src/Zoo.java
more ignore
meat added