color processing 1
merge2nd try mk

Conflicts:
	css/style.css