lol

lol
Merge branch 'master' of https://github.com/prommebr0r/Zoo

Conflicts:
	src/se/nackademin/zoo/Main.java