Merge conflicts
Add mario.h (mario theme)