Modified CharacterObject and CollisionManager so that collisions characters can no longer walk through each other and environment objects.
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam