Refactoring and code cleanup
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam

Conflicts:
	src/vooga/fighter/util/CollisionManager.java