more AI including test code
Resolved merge conflict in Game.js