Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 2 insertions, 0 deletions

diff --git a/scss/ninja.scss b/scss/ninja.scss
index 1061780a..13db5588 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -31,10 +31,12 @@
 @import "imports/scss/UserContent";
 @import "imports/scss/ScrollBars";
 @import "imports/scss/Components";
+@import "imports/scss/MontageOverrides";
 
 body {
 }
 
+
 // Codemirror
 //@import "imports/codemirror/_codemirror";
 //@import "imports/codemirror/_javascript";