Welcome SASS to the project!
Testing something out;
Merge branch 'kor-theme'

Conflicts:
	wp-content/themes/Tharsis/css/layout.css
	wp-content/themes/Tharsis/header.php