added music, new medal screens and other stuff
fixed merge issue