Temporary commit for merge
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
NEW: Added Map object for holding environment objects, background images, sounds, and start positions for a level
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam
BUG FIX: Fixed multiple compilation errors in Pixmap
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam