Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	README.md
	_config.yml
	_includes/head.html
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html
	about.md
	index.html
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 74e0d193998383d7b1ba85ca8379ee7602050e2f.