background
Merge branch 'master' of https://github.com/yoanngern/newsroom14

Conflicts:
	web/sass/layout.scss