Somewhat balanced waiting with new changes included
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment
Merged/redid grassfield to "work" with updates

"work" = exist
Just changing so it will be easier merged with master
Grass field agent now changes color to reflect its energy.  Max energy and spawning rates also different.
Adding a way to see if there's food
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment

Conflicts:
	src/chalmers/dax021308/ecosystem/model/agent/AbstractAgent.java
	src/chalmers/dax021308/ecosystem/model/agent/DeerAgent.java
	src/chalmers/dax021308/ecosystem/model/agent/GrassAgent.java
	src/chalmers/dax021308/ecosystem/model/agent/GrassFieldAgent.java
	src/chalmers/dax021308/ecosystem/model/agent/IAgent.java
	src/chalmers/dax021308/ecosystem/model/agent/WolfAgent.java
	src/chalmers/dax021308/ecosystem/model/environment/EcoWorld.java
	src/chalmers/dax021308/ecosystem/model/population/GrassFieldPopulation.java
Made the deers only attracted to grass that contain energy, and they only have to reach the edge of the grass to start eating
Drawing circle grass, deers running too far though
Adjustments to make grassfields work
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment

Conflicts:
	src/chalmers/dax021308/ecosystem/model/agent/DeerAgent.java
Added javadoc to forcecalculator
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment
Moved drawing of obstacles/shape/agents into their own methods
Merge branch 'master' of https://github.com/Ramqvist/Simulated-ecosystem into experiment
Merge remote-tracking branch 'origin/experiment'