new colour

Added Scott's favourite colour
fix difficult merge