le colour
Merge https://github.com/Ascendzor/QuadArt

Conflicts:
	javascript/configuration.js
	javascript/segment.js