Updated AI to compile
Fixed EnemyShip.js merge conflicts