Merge branch 'staging' into preview

1 files changed, 3 insertions, 2 deletions

diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 5b01b5d..8cdcdc6 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -64,7 +64,7 @@ URLs:
 Referenced Tracks:
 - Darling Dolorosa
 Lyrics: |-
-    (This is a test. I'm testing the ASMR. [[track:next-arrow|Next arrow.]] [[track:bowmans-credit-score|I'm thinking of a number.]] Invisible sandwich. [[track:rose-pragnant|I came as fast as I could.]] Things have gone completely pear-shaped. An overwhelming success. Breath has nothing to do with freedom. [[track:karkalicious|Karkat-licious.]] Inside joke. Hussie is a hack. Don't kinkyshame me. o is also a hack. Eridan's top half. [[group:canmt|Cool and New Web Comic.]] Horse painting. Curiosity satisfied. [[tag:rubs-juice|Rubs Juice.]] We didn't start the Homestuck. Roxy kitten. stacy-ampora-strider-ampora. Starbucks. Obscure Reference. Meme number. Petition to make this an emote. [[track:radiation-is-now-on-youtube|I only play classic SEGA.]] You just got trolled, LOL. [[track:angular-deceleration|Slow your roll.]] Ryan North got stuck in a hole with his dog. You're older than you've ever been. Anna is dyslexic so reading and writing are difficult for her. The ham cake was not a mistake. Grey face paint all over the walls. Who flipped the frog switch? Snoop Homestuck, shout out 4 tha fan art! Round [???] Dante Basco. This track contains copyrighted material. [[Penumbra Phantasm|Penumbra... Phantasm.]] Olive Garden. Terepy Pipes. Mambostuck. Sitska. [[track:rollercoaster-tycoon-theme|Rollercoaster Tycoon.]] Blitzing chakras. Mount Rainier. John is shorter than his toilet. Punishment time! [[artist:bill-bolin|Bill Bolin.]] It's the perfect crime. Nepetaquest. [[track:justice-must-be-a-serve|Justice must be a serve.]] Spitting into a bucket. Birthday wish. Nothing important.)
+    (This is a test. I'm testing the ASMR. [[track:next-arrow|Next arrow.]] [[track:bowmans-credit-score|I'm thinking of a number.]] Invisible sandwich. [[track:rose-pragnant|I came as fast as I could.]] Things have gone completely pear-shaped. An overwhelming success. Breath has nothing to do with freedom. [[track:karkalicious|Karkat-licious.]] Inside joke. Hussie is a hack. Don't kinkyshame me. o is also a hack. Eridan's top half. [[group:canmt|Cool and New Web Comic.]] Horse painting. Curiosity satisfied. [[tag:rubs-juice|Rubs Juice.]] We didn't start the Homestuck. Roxy kitten. stacy-ampora-strider-ampora. Starbucks. Obscure Reference. Meme number. Petition to make this an emote. [[track:radiation-is-now-on-youtube|I only play classic SEGA.]] You just got trolled, LOL. [[track:angular-deceleration|Slow your roll.]] Ryan North got stuck in a hole with his dog. You're older than you've ever been. Anna is dyslexic so reading and writing are difficult for her. The ham cake was not a mistake. Grey face paint all over the walls. Who flipped the frog switch? Snoop Homestuck, shout out 4 tha fan art! Round [???] Dante Basco. This track contains copyrighted material. [[Penumbra Phantasm|Penumbra... Phantasm.]] Olive Garden. [[artist:terepy-pipes|Terepy Pipes.]] Mambostuck. Sitska. [[track:rollercoaster-tycoon-theme|Rollercoaster Tycoon.]] Blitzing chakras. Mount Rainier. John is shorter than his toilet. Punishment time! [[artist:bill-bolin|Bill Bolin.]] It's the perfect crime. Nepetaquest. [[track:justice-must-be-a-serve|Justice must be a serve.]] Spitting into a bucket. Birthday wish. Nothing important.)
 ---
 Track: Terexi
 Artists:
@@ -360,6 +360,7 @@ Art Tags:
 - Feferi
 - Gamzee
 - 'cw: blood'
+- 'cw: nazism'
 Referenced Tracks:
 - Pumpkin Party in Sea Hitler's Water Apocalypse
 ---
@@ -413,7 +414,7 @@ Lyrics: |-
 
     Clearly I'm in the minority here when I say this, judging from the upvotes you guys suck from lurkers. Though perhaps you will listen to an important figure here. (Note how I pretend that being important means I post comments here sometimes and more than 10 people know I exist.) I'm not asking you to stop, It's nice to have more posts, I just don't want it blotting out the discussion and more community-esque posts. Homestuck brought me to the sub, the community made me stay. This is true for many of us here, even if such a statement seems alien to veteran Redditors outside of /r/homestuck.)
 Commentary: |-
-    <i>Niklink:</i>
+    <i>Niklink:</i> (wiki editor)
     (<a href="https://old.reddit.com/r/homestuck/comments/332gv9/meta_suicidalsushi_and_mindbleach_slow_your_roll/">[META] SuicidalSushi and mindbleach: Slow your roll</a>)
 ---
 Track: good remix of a homestuck song