html color stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	MVCProject/MVCProject.v12.suo