Hei
Merge branch 'master' of https://github.com/Marhaak/AI1

Conflicts:
	AI1/AI1/Agent.cpp
	AI1/AI1/Environment.cpp
	AI1/AI1/Environment.h