Add Circuit Breaker subgenres

[thecnoNSMB]

This adds the remaining genres from the Circuit Breaker setlist that got sorted under "Other". Some notes:

• "Thrash 8-Bit", "FM Funk", "Hardcore Techno-Punk", and "Electronic Mashup" appear to be coined by the original charters by combining pre-existing genre descriptors
• "Electronic Mashup" is additionally dubious, since it seems to only mean "a mashup made from electronic music", but I've included it anyway since that is a meaningful semantic distinction
• J-Core shares a lot of substitution names with Japanese Hardcore, including one with a slur ("j*pcore"); since Japanese Hardcore is an unrelated punk subgenre I've elected to exclude those for clarity.

Also, the diffs show changes to the last lines of each file I touched, I'm not sure what those are about since they don't seem to change anything and they didn't show up when I previewed my changes in the github text editor. I'm not sure how to get rid of them.

[thecnoNSMB]

I've figured out what's going on at the end of the files: the github text editor is adding trailing newlines to the files. I'm gonna see if I can figure out how to get it to stop doing that.

[thecnoNSMB]

Looks like I've fixed that issue now.

[thecnoNSMB]

For posterity, the full list of changes made in this PR:

• Thrash 8-Bit is now under Chiptune
• Shredwave is now under Electronic
• J-Core is now under Hardcore EDM
• Electronic Mashup is now under Mashup
• Hardcore Techno-Punk is now under Punk
• FM Funk is now under R&B/Soul/Funk