moved mario resources package
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Fix ArrayIndexOutOfBounds Error
made temporary default background for level
can now paint a background in LevelEditor and in simulator.
conflict merge
fixed merge conflicts pulling from master