Merge remote-tracking branch 'origin/master'

Conflicts:
	_config.yml
	_includes/themes/bootstrap-3/default.html
	_layouts/page.html

octopress

octopress
31231231231

312312312312312
Merge remote-tracking branch 'origin/master'

Conflicts:
	archive.html
	categories.html
	index.md
	pages.html
	tags.html