working on level 1
Merge branch 'master' of https://github.com/DSRoden/mario into liza
set sprite to begin at center of level 1
added level 1 collision
pulling down level 1
money bags not masked showing up
merging branches
merge conflics resolved
added background audio for level 1
collisions with boulders
edited world1 map
pulling graphics
Merge branch 'master' of https://github.com/DSRoden/mario into brian
pulling new wizard
Merge branch 'master' of https://github.com/DSRoden/mario into brian
world2
Merge branch 'master' of https://github.com/DSRoden/mario into world2map
merging all branches
continuing merging branches
Merge branch 'world2map' of https://github.com/DSRoden/mario into brian