changes and more… MORE GUI!
Merge branch 'master' of https://github.com/Imperiouspi/Complex-Life

Conflicts:
	src/lifeForms/animals/Lion.java
	src/lifeForms/animals/MountainGoat.java
	src/types/LifeForm.java