fixed merge conflicts from css branch

markdown/post/style.md

@@ -0,0 +1,16 @@
+[![Homepage](../img/banner.png)](../index.html)
+
+# Wew lad new colors
+
+It's been about a minute since I've done anything with this site but I figured what better time to randomly post things then now.
+Before this update I mostly used some neato fonts but most of it was some boring Times New Roman thing, _now the site doesn'tlook like a homework essay_.
+
+## But Why?
+
+I partly wanted to get my Gitlab page a bit more active but also because I didn't like the self-conflicting style from before.
+Instead of having a bunch of fonts that don't really go together I opted for fonts that are actually somewhat look nice next to each other.
+
+I'm still gonna mess with the styling but the changes likely won't be whole reworks like this one was, however, I'll probably use this as a place to post some _bhop stuff as well_.
+
+:^)
+

markdown/post/train.md

@@ -0,0 +1,17 @@
+[![HomePage](../img/banner.png)](../index.html)
+
+My Thanksgiving holiday came to a close recently which means I had to go back to university but since I was stuck on the train _literally all day_ I figured why not spin some stuff that's pretty neat.
+
+California Public transportation sucks.
+However, the train for long distance travel seems to be ""_a small bit_"" of an exception.
+I only put it like that because when there are no delays it feels like you're getting somewhere and there's no real worry about much else, just sit back and relax while you wait to get to your destination.
+California's public transportation system though, basically rekts all of this nearly everytime.
+When a train is delayed it keeps getting delayed.
+This means once you get on, it's going to keep getting delayed at nearly every stop.
+
+The ride is at least comfy neverless.
+Bonus points if you take the surfliner train which goes along the coast for the majority of the central coast.
+
+I didn't take pictures of the ocean because sleep but there was still some neat stuff to see, mainly tons of shoreline with a great spots that I've marked with my phone's GPS.
+
+Here are the coords in case you're curious: `34.6277141, -120.6281343`.

markdown/post/yes

@@ -0,0 +1 @@
+[![HomePage](../img/banner.png)](../index.html)