added colours to css file
fixed merge