Merge branch 'onWorld2' of https://github.com/DSRoden/mario into liza
masking expands
fixed conflict
destroyed sound between levels
resolving conflicts
world bounds
Merge branch 'liza' of https://github.com/DSRoden/mario into onWorld2
added rocks for world bounds
pulling all changes
Merge branch 'onWorld2' of https://github.com/DSRoden/mario into brian
world2, character needs some love
Merge pull request #6 from DSRoden/onWorld2

On world2
pulling changes
Merge branch 'master' of https://github.com/DSRoden/mario
fixed tiles
pulling changes
Merge branch 'liza' of https://github.com/DSRoden/mario
replacing master
balloon redraws in color when 6 assets are collected
text shows on top of mask