Merge branch 'master' into battle-music
Loop week 5 music
Merge branch 'battle-music'