Christina....I made so many changes to your stuff

Lifeform and Penguin and Fish etc.
I'M SORRY YOU'RE GOING TO KILL ME
mayybeee do games and the simulation classes DDD:
What happened?
Errors
Merge branch 'master' of https://github.com/friedeggs/icys

Conflicts:
	bin/icys/java/Egg.class
	bin/icys/java/Fish.class
	bin/icys/java/Mode.class
	bin/icys/java/Penguin.class
	bin/icys/java/PolarBear.class
	bin/icys/java/Utilities.class

git commit