merge
Merge branch 'master' of github.com:readandchedan/readandchedan.github.io

Conflicts:
	_posts/.DS_Store