finished off locationblock, added addX() and addY() methods to location
added troop class, few misc changes