fixed mapping
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	pom.xml
	src/main/java/nl/rdj/Animal.java
	src/main/java/nl/rdj/Elephant.java
	src/main/java/nl/rdj/Lion.java
	src/main/java/nl/rdj/Zoo.java