functional without blog
functional with blog, but no pagination
Merge branch 'work'

Conflicts:
	_config.yml