Updated colors
Resolved merge conflics

Conflicts:
	index.html resolved