Fixed merge conflict in the map from upstream. Added back the correct reachedGoal method
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga