Changed font color
Fixed up Interactive Entity after merge errors
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga