minor changes
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem
color
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem
.
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem
Merge branch 'master' of git://github.com/Ramqvist/Simulated-ecosystem

Conflicts:
	src/chalmers/dax021308/ecosystem/model/population/AbstractPopulation.java
	src/chalmers/dax021308/ecosystem/model/population/GrassPopulation.java
	src/chalmers/dax021308/ecosystem/model/population/RabbitPopulation.java
	src/chalmers/dax021308/ecosystem/model/population/WolfPopulation.java