Test4
Merge branch 'master' of github.com:creamidea/creamidea.github.com

Conflicts:
	2012/07/01/configuration/index.html
	2012/07/01/contributing/index.html
	2012/07/01/deployment-methods/index.html
	2012/07/01/extras/index.html
	2012/07/01/frontmatter/index.html
	2012/07/01/github-pages/index.html
	2012/07/01/heroku/index.html
	2012/07/01/home/index.html
	2012/07/01/installation/index.html
	2012/07/01/migrations/index.html
	2012/07/01/pages/index.html
	2012/07/01/pagination/index.html
	2012/07/01/permalinks/index.html
	2012/07/01/plugins/index.html
	2012/07/01/posts/index.html
	2012/07/01/resources/index.html
	2012/07/01/sites/index.html
	2012/07/01/structure/index.html
	2012/07/01/templates/index.html
	2012/07/01/troubleshooting/index.html
	2012/07/01/usage/index.html
	2012/07/01/variables/index.html
	2012/07/02/test/index.html
	2013/02/06/BegineLisp/index.html
	404.html
	README
	about.html
	archive.html
	atom.xml
	css/grid.css
	css/img/alian-footer.png
	css/img/header-moon-background.png
	css/img/search-spaceship-background.png
	css/normalize.css
	css/pygments.css
	css/style.css
	docs/index.html
	favicon.ico
	img/Qoo8.jpg
	img/article-footer.png
	img/footer-arrow.png
	img/footer-logo.png
	img/icecream.png
	img/logo-2x.png
	img/milky-way-galaxy.jpg
	img/octojekyll.png
	img/qooni.jpg
	img/tube.png
	img/tube1x.png
	index.html
	js/jquery-1.9.1.min.js
	js/modernizr-2.5.3.min.js
	template.txt