Restart possible
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/agents/World.java
Merge