Merge branch 'staging' into mediaupdate

8 files changed, 17 insertions, 9 deletions

diff --git a/album/homestuck-vol-10.txt b/album/homestuck-vol-10.txt
index 6e8c8aae..bfb978f3 100644
--- a/album/homestuck-vol-10.txt
+++ b/album/homestuck-vol-10.txt
@@ -173,7 +173,7 @@ Contributors:
 - viaSatellite (bass)
 - David Dycus (synths, composition)
 - Ian White (trumpet)
-- Kelly Sadwin (violin)
+- Noel Sadwin (violin)
 References:
 - track:showtime-piano-refrain
 - track:showtime-original-mix
@@ -372,7 +372,7 @@ Duration: 2:06
 References: Skaian Ride, Skaia Voyages
 Art Tags:
 - John
-- Dave
+- AH
 URLs:
 - https://homestuck.bandcamp.com/track/skaian-happy-flight-2
 - https://youtu.be/rozLPCPXopw
@@ -641,7 +641,7 @@ URLs:
 Contributors:
 - Marcy Nabors (composition, bass clarinet)
 - Catboss (flute)
-- Kelly Sadwin (violin & viola)
+- Noel Sadwin (violin & viola)
 - Jamie Paige Stanley (percussion)
 - Kyle G. Jamolin (lyrics & choir direction)
 - Ciaran Cain (choir)
diff --git a/album/homestuck-vol-6.txt b/album/homestuck-vol-6.txt
index 0618c36f..a808fb00 100644
--- a/album/homestuck-vol-6.txt
+++ b/album/homestuck-vol-6.txt
@@ -89,6 +89,8 @@ Commentary:
     THE GAMES WILL NEVER STOP
     you know the rest
     (alternatively: where the heck did that horrible dude come from get him out of the way of the album art jesus)
+
+    I just binged on too much <a href="https://www.youtube.com/watch?v=xkreaWxL224">Go Mario Go</a> and <a href="https://www.youtube.com/watch?v=1cez1x1Gei4">The Heat Is On (bust a groove 2)</a> and went out to mow the lawn and came up with it
 Lyrics:
     Alright bros, are you ready?<br>It's time for the one, the only, GameBro!<br>He's coming to your screen straight from the magazine<br>The mix meister of Master Swords and mushrooms<br>Are you sure you're ready for this?<br>Well come on, get ready, get set, and here we go
     The GameBro is here and he's got the games<br>All you other lamebrainers better feel the shame<br>He can bend the rules, he's too cool for school<br>And he's got just a few cheat codes for you<br>There ain't nothing that'll ever hold this bad boy down<br>That hat that he's wearing's like his personal crown<br>He's got every game beat and skills that sweet<br>But if you want in his crew, you gotta be elite
diff --git a/album/homestuck-vol-8.txt b/album/homestuck-vol-8.txt
index 4ed70922..42031cc0 100644
--- a/album/homestuck-vol-8.txt
+++ b/album/homestuck-vol-8.txt
@@ -567,7 +567,7 @@ Commentary:
 -------------------------------------------------------------------------------
 Track: Judgment Day
 Artist: Toby Fox
-Contributors: Kelly Sadwin (violin)
+Contributors: Noel Sadwin (violin)
 Track Art: Lazylaz
 Duration: 2:00
 References:
@@ -664,7 +664,7 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Black Hole / Green Sun
 Artist: Malcolm Brown, Toby Fox
-Contributors: Tensei (electric guitar), Kelly Sadwin (violin)
+Contributors: Tensei (electric guitar), Noel Sadwin (violin)
 Track Art: none
 Duration: 2:30
 References:
diff --git a/album/lofam4.txt b/album/lofam4.txt
index 1adff5b0..71c8cd21 100644
--- a/album/lofam4.txt
+++ b/album/lofam4.txt
@@ -860,7 +860,7 @@ Art Tags:
 URLs:
 - https://unofficialmspafans.bandcamp.com/track/schr-dingers-harbinger
 - https://youtu.be/n39rrqi8XPM
-Credits:
+Commentary:
     <i>Noisemaker:</i>
     Initially from call and new 2: locomotif under the name Excess Express, I wanted Schrödinger's Harbinger to be Jasprose-themed to compensate for the lack of tracks in that category, as well as to make some additions to the original trakc.
     <i><b>WHATISLOSTINTHEMINES:</b></i>
diff --git a/album/one-year-older.txt b/album/one-year-older.txt
index b75dc264..fe8f1d19 100644
--- a/album/one-year-older.txt
+++ b/album/one-year-older.txt
@@ -215,6 +215,11 @@ Track Art: K
 Duration: 2:33
 Art Tags:
 - John
+- Vriska
+- Dave
+- Jade
+- Rose
+- Karkat
 URLs:
 - https://erikscheele.bandcamp.com/track/respit
 - https://youtu.be/9eSnvqGpzj8
diff --git a/album/strife-2.txt b/album/strife-2.txt
index 60396afe..1f56b31b 100644
--- a/album/strife-2.txt
+++ b/album/strife-2.txt
@@ -152,4 +152,5 @@ URLs:
 -------------------------------------------------------------------------------
 Track: Duet
 Duration: 2:37
-Has URLs: no
\ No newline at end of file
+URLs:
+- https://www.youtube.com/watch?v=oJHJGgbpeMI
\ No newline at end of file
diff --git a/album/the-baby-is-you.txt b/album/the-baby-is-you.txt
index 1b17aaa8..0a3005e0 100644
--- a/album/the-baby-is-you.txt
+++ b/album/the-baby-is-you.txt
@@ -2,7 +2,7 @@ Album: The Baby is You
 Artist: Toby Fox
 Cover Art: Astroliner
 Has Track Art: no
-Date: September 27, 2010
+Date: October 13, 2010
 Date Added: January 12, 2021
 Groups:
 - Toby Fox
diff --git a/album/the-wanderers.txt b/album/the-wanderers.txt
index 97f2454d..73d19067 100644
--- a/album/the-wanderers.txt
+++ b/album/the-wanderers.txt
@@ -53,7 +53,7 @@ URLs: https://youtu.be/KrimTgZi5uk
 -------------------------------------------------------------------------------
 Track: Endless Expanse
 Artist: Erik Scheele
-Track Art: Guy
+Track Art: Carla Bravo
 Duration: 5:59
 Art Tags:
 - WV