Site updated at 2014-10-06 14:06:41 UTC
Merge branch 'master' of https://github.com/zouivex/zouivex.github.io

Conflicts:
	404.html
	assets/font-awesome/.gitignore
	atom.xml
	blog/2014/09/08/introduction-to-sicp-reading-note/index.html
	blog/2014/09/09/sicp-1-1/index.html
	blog/2014/09/13/sicp-1-2-1/index.html
	blog/2014/09/21/sicp-1-2-2/index.html
	blog/2014/09/23/sicp-1-3-1/index.html
	blog/2014/09/index.html
	blog/archives/index.html
	blog/categories/sicp/atom.xml
	blog/categories/sicp/index.html
	index.html
	posts/2/index.html
	posts/3/index.html
	posts/4/index.html
	posts/5/index.html
	robots.txt
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-10-06 14:11:44 UTC
Site updated at 2014-10-06 14:31:16 UTC
Merge branch 'master' of https://github.com/zouivex/zouivex.github.io into source
Add missed CNAME