Fixed width initialised to the wrong value

src/canvas.js

@@ -189,11 +189,10 @@ export function setStrokeColour(colour) {
   stroke_colour = colour
 }
 
-<<<<<<< HEAD
 export function getStrokeColour() {
   return stroke_colour
-=======
+}
+
 export function setStrokeRadius(radius) {
   stroke_radius = radius
->>>>>>> Implement brush size
 }