GUI
Merge branch 'master' of github.com:Ramqvist/Simulated-ecosystem

Conflicts:
	src/chalmers/dax021308/ecosystem/view/OpenGLSimulationView.java