ICE
Merge remote-tracking branch 'origin/master' into settings
change color to colors (reserved word), rework layout.jade and scripts
Merge pull request #6 from adrianblp/settings

Settings