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

Conflicts:
	AI4/AI4/Source.cpp
Merge branch 'master' of https://github.com/Marhaak/AI4

Conflicts:
	AI4/AI4/Source.cpp
Eh?
Merge branch 'master' of https://github.com/Marhaak/AI4