about

1 files changed, 14 insertions, 0 deletions

diff --git a/old/music.html b/old/music.html
index b83fb36..56be16b 100644
--- a/old/music.html
+++ b/old/music.html
@@ -11,7 +11,11 @@
         body {
             display: flex;
             justify-content: center;
+<<<<<<< HEAD
+            background-image: url(img/bg/Artifact\ 2.png);
+=======
             background-image: url(../img/bg/Artifact\ 2.png);
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
       	    background-attachment: fixed;  
       	    background-position: center;
         }
@@ -77,7 +81,11 @@
                 <a href="house.html">Go home?</a>
                 <script src="https://juneish.neocities.org/ring/beepbox/ring.js" data-song="https://jummb.us/player/#song=j6N04Wishng43s0k0l00e19t1Ua5g19j0lr1O_U0000000000000000000000000000000000000000000000i0o3331333234333334T5v0xu05f032ve2ie13000qwB15110Wa0d2a0H_RBHBziiii9998h3E1c0b7T5v0nu05f0000qwB15110Oa0d2a0H_RBHBziiii9998h3E1c0b7T0v0pu00f153q8740Oa70d4a0w5h4E0c0T5v0su51f0000qwB17110Ba0d080H-IHyiih9999998h0E1c0b6T9v0pu1af010s500q040Oad030w2h0M00001111222233334444555566667777MMMMLLLLKKKKJJJJIIIIHHHHGGGGFFFFE0c0T7v0ru07f050p61770q72d42g300q8J021a90k7001600Vald060HT-SRJJJJIAAAAAh0IcE1c0c11T7v0wu07f150qoY021990l60025ba00506310ad010HT-SRJiirrAKTijh0IaE2c0c11c01T7v0wu07f150qoY021990l60025ba00707700ad010HT_____Qzriiii8h0IaE2c0c11c01T7v0vu07f050p61770q72d42g300q8J021a90k7005ba00600Dald060HT-SRJJJJIAAAAAh0IaE1c0c11T5v0tu05f180qgA010re0030Fad000HTZKSrih8g00000h0E1c0b7T1v0qu18f0000q040Oad230A0F0B0Q0000Pf600R0000E1c0617T7v0tu07f040p61770q72f500q8I00001500Oad060HT-SRJJJJIAAAAAh0IaE1c001T1v0yu83f0000q8D18120Oa70d030AbF6B2Q0572P9995R0000E2c0b273T1v0pu83f0000q8D18120Oa70d030AbF6B2Q0572P9995R0000E2c0b273T7v0ku07f150qoY021990l6003310000sad010HT-SRJJJJIAAAAAh2IaE1c0c11T5v0pu05f022792qe0112k6qgA010n50030Oad030HTZIzrih9004000h0E1c0b7T4v0vuf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0uuf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0puf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0T4v0puf0f1a0q050Oa0z6666ji8k8k3jSBKSJJAArriiiiii07JCABrzrrrrrrr00YrkqHrsrrrrjr005zrAqzrjzrrqr1jRjrqGGrrzsrsA099ijrABJJJIAzrrtirqrqjqixzsrAjrqjiqaqqysttAJqjikikrizrHtBJJAzArzrIsRCITKSS099ijrAJS____Qg99habbCAYrDzh00E0c0Tav0pu00f0000q00d040E0c0Tav0pu00f0000q00d040E0c0Tav0pu00f0000q00d040E0c0b28p0Bct2lboQ8xA2kNQ9s-4g000000000000000000000000000000000000000000000000000000000000004gO1aoW4GmNE00000000000000000000000000w4c92CexaBI20gMAaVG4GmM0g264xj7gBiS000000000000000000000003S02YgO5ct2lboQbN38kNQ9kJzg1s8p2CexaBIq5MxAaoW4GmNEn26gFzEiFr6w000000000000000000000000020000000000000000000000000000000000000000000000000000000000001gh38kNQ9mNHDw00000000000000000000000000000000000000000000000000000000000004gO5ct2lIq0000000000000000000000000000000000000000000000000000gx248gx248gw0000000000000000000000000000000000000000000000000208oi5sR2lbo40xx8lPk9kJzU000000000000000000000000000000000000000000000028o000000002cFQ0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004gO5ct2lIqVY8w00000000000000000000000000000000000000000000028o6AaoW4GmO80000000000000000000000000000000000000000000000000000000000008ODg000000000000000000000000000000000000014cxj7gBr6w000000000000000000000000000xj7gBiSds-Jw0000000000000000000000000000000000000000000000000000000000000000000000000wgxa4gh524ohx24Eh14k8hx6o00000000000000000000000000000000000001248gx248gz848gx248gx2cxj000000000000000000000000000000000000048gx248gx248gx248gx248gy600000000000000000000000000000000000000000000000000000w200w20cw0000000000000000000000008xw8kNQ9kNo0dsY08h1aoa00000000000000aw000000000000000000000000000000000001400000000x20xx8kNQ9kNrnf00000000000000000000000000000000000000wy288wy288ww00000000000000p2NnFA-8gZ8ui7F3QxWg-A7F3QxWhLV4f8zOgZ8uAfi7QwYyfi7F6ACiq7a1W8ZcuAfg7j8Z2Njdvh7d9ACxwipbEBypfB1Wo-U7j2QkObjSdczQh7P8uwr-mFsy7GzQhW9zV23UyeTFo0CfGCKMO_kJlRklT-yZxBuLwzj7SGQbixbRijRxDFB-oolJB-PeKLJcLTfOLj9ZcrZINUlcvuV0fm7EzS1W8Z8v1xS6jX0r37OmQOvm7SJ1WJZG9Bx1-0P6uMO_pkYv-8OeJrYgfOK2CjUx3EA-Af93V8v93Qx-i3V8uAfid_y8v4hV8v93V8uAfOgt0DO8Z8v96ACiq7a1-8zQNYAfA1QOfgIkPnQhOW9fEkOj0AOnhbdk7j9Zcvc29xqap5FZhGUGb4uyj9Z8uwrWp7HkG9fExZGfAhYyoW97Es1QiD8zIWnw0CfGCKN0FNpiP42D5SHc4LR5r3bZ_ELopnHUcdcv1zO8ZujR1MWpvASVyFjHiFvzkOe8ZDsHw2OPNv4cAChhimmtfF8O6LOgkS3NxppN-Bw1gziOPLZaS33bZeDzu4Tzel49OlFDy-_HizIFim6u3WaUDYul2mkBdT09xD7Xu9NX0efQZ0apN-8hN-n77U8qWpvGsh77WiiQBn9am66LAulmttjRxN-AFqioJ9iQhNU2CubW8000ltzPrRYjkjGpM-LAgaCLA-x8CtfHFAuxjGpHXvAp5cPZvgECnWBxB-DcFCfI-N9cRZlcLQqp7F4PwZpqOfoZnqtzOf8EhzfPhPdjd7lRp9AuzmH6hWKNVTeLyaCsvB7gnluRkFNWpNYRlPKtnbZeXI5CCubV1Nw9CzxQRtiGCbGW4kOfgGpN-HGFKoul9NW9N-Ljf5N22F73W-CEkPxZv8wldv9Z2hcWvmj8Z2DoCq-TV56pypDW-xaH3bZmJcLQOCo-PX4mcp7GWKnWii4AO_jFAuEppMuOBhzmnWKNWKNV7ENgB6BxCLGTud9cjd7lRpOj8ZaRpPAuHIusjKLIEPTdloNCLGV7GWw24z3dviECnWRFD7W-LFCmsvH8bjnjeDMByVTeHB-MdZopN-wyAfmCubVnAHw1opULAQE000IIYnN399AkkBBDvWiczbbZiUnqxmofmCiSwSrEdWiaOPzZzlk7SlFDy-0WwGXakBxDy-yKY1axHaiCXw4MPzZL4UZx77X-X3f5N682pqp7wUmhjdvijbY3Ep5czRGl1cnhEXegX4Cu5x6Ct-5n0v95cFNleFD4EEEjef4WpTUCkOD57GCt26a8y-t-Cny5jaokg5WpByF6CnyKOFD7yGzHaljdubN8CsuaRcUYbMwbQOYiFDyUGFD7y2DdtcLQrdGTmcnlRsNt3IipvwQOf8QQPnQWKsvGVEXSqpvHQO0gDxQXZwB-6JopN8xgsHppULy6ij8EFbbe_QAp6mnWBMKR2IMuJ3rECIIU_jGExcO6ODZk-FI9_ccU_vM0mcqKHCTHUCm0IBkPxZv8wm6nWixjd7lSJ9B-AChU6BjHlcUDlSp69CvHW2CecuG8BcNZDRVccRZuD4LsP3e3SA5L8ZzRtFSf5Rt12cpXFCLGC9GVjFTGNtncLlSQpRj8Z6DmIzRtzPHtnlSqNHRjefQ33dvhWMO_mDjefRyNAuHGVHWBUGNGVSuHB-xiiMPzZ1lrmIcYnT61mczRtnbZB29cLRBtncnlM0d4RtDiCbGW4kOfgGpN-HJ94PhQ4O_kD7I4U_3VIcYn4oMjbj8YiMIyCq-ACnU7gOap7IkG2oKzhSsxS9cYb2dBD7F55dtDfhhEopNWYxpp7HOAppMqBKv6pOSIoka8SmubGdsbbefkUFC6suENVvsBzqZxDyWXJPiaiyDOteO3nSoW5BCKJQYeDH6bGWKoK808AO_1FAuhFFCLFRsU_lPhOqJcLMlcw49Us001dtcLNb8gs3mcnlRsNt34ipvwQOf8QQPnQWKsvGVEXiDGZcw49UslcUvnQR4y1kRYDQ94PFZpczQatjdvrYz8FCvHW54O_kQOCo-PWYlz8ZnlO_lgzILkOpMuKJpvGX7GX7Auigz6tcRZgCnWqCqeHGOWzpHehWKNVNeW-NCb0H6q-HAuHx48C6q-2FVnIcU_nOjefR5neVRsLQYKMhmYkPNv800apTUm9B-3U2MeFD4EEh9D7yvyrzljex354hve_jbN2FBca82ZcONkzjbZljaoniFD7yGzjefMr9lcRULQypNUHkPzML20LjbNaCubyE4XZxB-8AX3eD4dznFD7y8U_gkd0MOcmACnyKlCMOY8hD7RbcIz5qOGOBlDbplYS9Cm8kpN-h002CnyMRQPzN7AhuCkwclcON9xCm8hFBUAbQOAh5UBN2fygLEIcUYizjbMwj8Npj2i0gj54kMxixgOehOB2wCky52x2jax1xDw8N400ap6aydj0y8g8Rcs342dj2i0g8QOcg8Qycg8WpuadHhAaVNYX1cknj344z400002suCnyNHPzQOcgE6LefkOf54a2CbAowCky4Xewkw00082wa2wa80c8vg0f5Mvku_g0e_053NW01NUpG0Gw1yw1ywRBw28r4qWE0a06W3ko0ww0nw202dtk5EMMk1B04402Y0g5W0Vu0808Lg7ef041IhQW0VHw202dtg9e31rb0405o03n1jn09g0Qg100H80oEckxxu0ma06y0805g0d46el040M8Lg0e_0Q04suE06a3R80wc2w0qU0Gk1ic28M10sx6KE3ywFEw20S8RR00QgqOM10lhQW0RHw202d500Tgx100RM10177E3SK0830G05u3nvw201l0aY6Ik7ex0402w2ubxCg00A5Mb4066vzFQ1rb04N9l0350351Hb040S8RRg0k0dQ6EM1100L0404qWEbhxwE3a08805U0wbQ1OY0g0huw4su083ozFQ1Pn0404qWEds606a3iw202I01HwFHw4E0q80w0lE0ck6agML0b503b1pg100G01EwNOE0w615W01TUfw0zzR00NguF041wk03LM10c2w0ubxC01m00VI5513n2Vg100E2TyUbG0k03CM9ge400V80Ud_QczNs0k7NtgfK90VgbkE1iwpN8vw0E1DyVAyfyW1ZNU5yg2ef3Y00000"></script>
             </div>
+<<<<<<< HEAD
             <img src="../img/nav/redplayer.png">
+=======
+            <img src="../img/nav/redplayer.png">
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
         </div>
 
         <div class="container">
@@ -280,9 +288,15 @@
                 <p class="genre">(electronic, ambient)</p>
             </div>
             
+<<<<<<< HEAD
+            <div class="rock" style="background: linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.7)), url(img/gnome.jpg); background-size: cover;">
+                <h2>Song of Storms - Jan 29th, 2023</h2>
+                <p>This is a "moss rock" remix of Song of Storms, based on <a href="../img/gnome.jpg">this image</a>. I went for prog.</p>
+=======
             <div class="rock" style="background: linear-gradient(rgba(255, 255, 255, 0.7), rgba(255, 255, 255, 0.7)), url(../img/gnome.jpg); background-size: cover;">
                 <h2>Song of Storms - Jan 29th, 2023</h2>
                 <p>This is a "moss rock" remix of Song of Storms, based on <a href="../img/gnome.jpg">this image</a>. I went for prog.</p>
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
                 <audio loading="lazy" controls="true">
                     <source src="music/songofstorms.ogg" type="audio/ogg" />
                 </audio>