More merge repairs. Hopefully done.

cms/static/js/template_loader.js

@@ -5,7 +5,7 @@
 	if (typeof window.templateLoader == 'function') return;
 	
     var templateLoader = {
-      templateVersion: "0.0.8",
+      templateVersion: "0.0.9",
       templates: {},
       loadRemoteTemplate: function(templateName, filename, callback) {
         if (!this.templates[templateName]) {

cms/static/sass/.gitignore

 *.css
 descriptor
 module
-/bourbon

cms/static/sass/_courseware.scss

@@ -5,12 +5,7 @@ input.courseware-unit-search-input {
 }
 
 .courseware-overview {
-	.new-courseware-section-button {
-		@include grey-button;
-		display: block;
-		text-align: center;
-		padding: 12px 0;
-	}
+	
 }
 
 .courseware-section {

cms/static/sass/_variables.scss

@@ -13,8 +13,11 @@ $body-line-height: golden-ratio(.875em, 1);
 $pink: rgb(182,37,104);
 $error-red: rgb(253, 87, 87);
 
+$offBlack: #3c3c3c;
 $blue: #5597dd;
 $orange: #edbd3c;
+$red: #b20610;
+$green: #108614;
 $lightGrey: #edf1f5;
 $mediumGrey: #ced2db;
 $darkGrey: #8891a1;