added cool colorscheme and made warm colorscheme consonant
Merge remote-tracking branch 'origin/master'