several changes + deer + minor update to wolf
Noah, please check my changes to grass
Merge branch 'master' of https://github.com/Imperiouspi/Complex-Life

Conflicts:
	bin/types/World.class
	src/types/World.java