Merge remote-tracking branch 'MEGAMASTER/pregmod-master' into pregmod-master

src/js/vectorRevampedArtControlJS.tw

@@ -246,7 +246,12 @@ class ArtStyleControl {
 			["dyed green", "#A6C373"],
 			["blue dyed", "#5b8eb7"],
 			["dyed blue", "#5b8eb7"],
+<<<<<<< HEAD
 			["tiger striped", "#e2d75d"]
+=======
+			["tiger striped", "#e2d75d"],
+			["olive", "#a46237"]
+>>>>>>> pregmod-master
 		];
 		
 		var skinPaletteMap = new Map(skinPalette);