added trolls
Merge branch 'towerdefense' of https://github.com/duke-compsci308-spring2013/vooga into towerdefense
merge conflicts