pushing to master

fixed the refactoring code of music and postgame screen