new content
layout tags
Merge branch 'master' into gh-pages

Conflicts:
	devine.md