Merged and deleted old classes that came from upstream.
Removed more old cold from upstream.
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga