gh-pages
ver. 0
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	_config.yml
	_includes/JB/pages_list
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html
	index.md
	pages.html