fixed merge conflicts from css branch

post/bstyle.css

@@ -7,32 +7,59 @@ html {
 
 @font-face {
 	font-family: 'Fixedsys';
-	src: url(../fonts/FSEX300.ttf);
+	src: url(./fonts/FSEX300.ttf);
 }
 @font-face {
 	font-family: 'Freemono';
-	src: url(../fonts/FreeMono.otf);
+	src: url(./fonts/FreeMono.otf);
 }
+/* sick nav bar */
+.topnav {
+	overflow: hidden;
+}
+.topnav a {
+	float: left;
+	display: block;
+	/* text color */
+	color: #f2f2f2;
+	text-align: center;
+	padding: 14px 16px;
+	text-decoration: none;
+	font-size: 17px;
+}
+.topnav a:hover {
+	background-color: #493267;
+	color: #faebd7;
+}
+.active {
+	background-color: #0e1111;
+	color: #faebd7;
+}
+.topnav .icon {
+	display:none;
+}
+/* now some stuff for the text */
 body {
-  color: #444;
+  /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
+  color: #373854;
+  background-color: #faebd7;
   font-family: Fixedsys; 
   font-size: 12px;
   line-height: 1.7;
   padding: 1em;
   margin: auto;
   max-width: 42em;
-  background-image: url("../img/backt.png");
-  background-repeat: repeat;
 }
 
 /* Link stuff */
+/* default link color */
 a {
-  color: ##FDD491;
+  color: #7bb3ff;
   text-decoration: none;
 }
 /* visited link */
 a:visited {
-  color: #0047a6;
+  color: #9e379f;
 }
 /* hovering link */
 a:hover {
@@ -69,7 +96,7 @@ a::selection {
 
 p {
   margin: 1em 0;
-  color: #E3DCCD;
+  color: #F1C6A7;
 }
 
 img {
@@ -77,7 +104,7 @@ img {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  color: #e1e1e1;
+  color: #493267;
   line-height: 125%;
   margin-top: 2em;
   font-weight: normal;
@@ -113,11 +140,10 @@ h6 {
 }
 
 blockquote {
-  color: #d8d8d8;
+  color: #3b444b;
   margin: 0;
   padding-left: 3em;
-  /*border-left: 0.5em #008fae solid;*/
-  border-left: 0.5em #A40026 solid;
+  border-left: 0.5em #493267 solid;
 }
 
 hr {
@@ -185,7 +211,7 @@ sub {
 ul, ol {
   margin: 1em 0;
   padding: 0 0 0 2em;
-  color: #858585;
+  color: #a3a3a3;
 }
 
 li p:last-child {