Zone/ erros

Added some logic to Zone, fixed a few errors.
Merge branch 'master' of https://github.com/james-marshall314/ecosystem

Conflicts:
	Deer.java
	Zone.java