Added Mario back
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
Refactored playerPaintLocation
Fixed issue with painting Sprites near the boundary of the Level
Merged