Working on agent
Merge error
Merge branch 'master' of https://github.com/Marhaak/AI1