added xmas colors
Merge branch 'master' into dark-color-scheme

Conflicts:
	styles.css