solving conflicts
Merge pull request #691 from pedromarins/webflow-css-file

solving conflicts