added colour
Merge branch 'master' into colour

Conflicts:
	testfile
Merge pull request #1 from steveandroulakis/colour

Colour