firstfold prettier
Merge branch 'master' of github.com:julencja/wf-website-20

Conflicts:
	assets/style.css