Merge branch 'layout'

Conflicts:
	_config.yml