fiksa litt på pig
Merge branch 'master' of https://github.com/torel/farm-animals

Conflicts:
	farmAnimals.zip