update1.2

added music files

added pause menu
update 1.2 resolve conflict