From 47f7d18a8c86d4fd884a232916e6615648ce484c Mon Sep 17 00:00:00 2001
From: Kasper Friis Christensen <kasper@friischristensen.com>
Date: Tue, 23 Jan 2018 23:45:06 +0100
Subject: [PATCH] fixed conflict

---
 _scss/base/_typography.scss  | 12 +++++++++---
 _scss/module/_indexpage.scss | 13 ++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/_scss/base/_typography.scss b/_scss/base/_typography.scss
index 4f0001c..9010eea 100644
--- a/_scss/base/_typography.scss
+++ b/_scss/base/_typography.scss
@@ -1,11 +1,17 @@
 html {
-	font-family: 'Open Sans', sans-serif;
 	font-size: 16px;
 }
+body {
+	font-family: 'Open Sans', sans-serif;
+	font-family: 'Roboto', sans-serif;
+}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2 {
 	font-family: 'Montserrat', sans-serif;
-	
+	font-family: 'Eczar', serif;
+}
+h3, h4, h5, h6 {
+	font-family: 'Roboto', sans-serif;
 }
 
 h1 {
diff --git a/_scss/module/_indexpage.scss b/_scss/module/_indexpage.scss
index 8205555..90f4092 100644
--- a/_scss/module/_indexpage.scss
+++ b/_scss/module/_indexpage.scss
@@ -25,12 +25,19 @@ section {
 		}
 	}
 
-	.paragraphs {
+	.paragraphs { 
 		column-count: 2;
-		margin: 1rem 1rem 200px;
+		text-justify: distribute;
+		text-justify: inter-character;
+		column-gap: 2rem;
+	}
+}
+
+	.paragraphs {
+		
+		margin-bottom: 3rem;
 		h3, p {
 			max-width: 300px;
-			font-family: 'Roboto', sans-serif;
 		}
 		p + h3 {
 			margin-top: 50px;