sss
Merge branch 'articleLayout'

Conflicts:
	_site/feed.xml
sss
no message
no message
Revert "no message"

This reverts commit c9775e4e68fc0363eb087db9da63ca7e6b633df8.
Merge branch 'articleLayout'

Conflicts:
	_site/feed.xml