Layout Changes
no message
Commit
Merge branch 'articleLayout'

Conflicts:
	_site/feed.xml