#27 imp, style to file (main.css)
Merge remote-tracking branch 'origin/master'