removed a comment
Fixing issue #35 for the AI. HAL no longer takes an extra turn now
fixed merge conflicts after merge from ethan's dev into origin's dev