Delete

Merge remote-tracking branch
'origin/master'

Conflicts:
	2014/07/09/hello-world/index.html
	archives/2014/07/index.html
	archives/2014/index.html
	archives/index.html
	index.html