changed addTroop in GM to takes in Point and player name
fixed merge conflicts