eh?
Merge branch 'master' of https://github.com/Marhaak/AI2

Conflicts:
	AI1/AI1/Agent.cpp
Merge branch 'master' of https://github.com/Marhaak/AI2
hay
Merge branch 'master' of https://github.com/Marhaak/AI2

Conflicts:
	AI1/AI1/Agent.cpp