Something went wrong with git.

..as usual.
Merge branch 'HyperNeatFramework' of https://github.com/RuthRainbow/anemone into HyperNeatFramework

Conflicts:
	src/main/java/group7/anemone/Environment.java