Blocks
Merge branch 'master' of https://github.com/friedeggs/icys

Conflicts:
	bin/icys/java/Block.class
	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
	bin/icys/java/WaterPollution.class
	src/icys/java/Block.java
	src/icys/java/Mode.java
	src/icys/java/WaterPollution.java

git commit origin master