Merge branch 'master' into battle-music
loop week 8
Merge branch 'battle-music'