Sound effects/music branch with conflicts with master resolved

I think the return button is already being made in the initWithFrame method