stuff
Merge branch 'master' of https://github.com/Imperiouspi/Complex-Life

Conflicts:
	bin/lifeForms/animals/Horse.class
	bin/lifeForms/animals/Rabbit.class