First commit
Merge branch 'master' of github.com:sevensmall/sevensmall.github.io

Conflicts:
	archives.html
	author/daniel-wang.html
	authors.html
	categories.html
	category/writing/index.html
	index.html
	pages/about.html
	posts/2014/index.html
	posts/hello-pelican.html
	sitemap.xml
	tag/blog/index.html
	tag/pelican/index.html
	tags.html