kacke
Merge branch 'master' of https://github.com/dima888/AD.git

Conflicts:
	src/Hund.java