fixed merge conflict in xml file
Merge branch 'towerdefense2.0' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense2.0