Update base layout

Conflicts:
	_site/feed.xml