fix wrong property name
update style-guide
update style-guide
copy latest styles from prefs branch
Update global.styl
Merge pull request #17 from DaQuirm/feature/style-guide

Feature/style guide