added getTargetsWithinRadius() to GameMap.java
fixed merge conflicts