fixed some of the mario dependencies
fixed bug in level background
solved conflicts
fixed simulation bug
Merge branch 'master' into scrolling_platformer
fixed conflicts from pull from master
removing unused files
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga