Unit changes
Fixed code in Map class
Merge branch 'towerdefense' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense
Merge branch 'master' into towerdefense
commit is necessary