update
Merge branch 'master' of https://github.com/julencja/wf-website-20

Conflicts:
	assets/style.css
	index.html