Replace master branch with page content via GitHub
	new file:   feeds/all.atom.xml
	deleted:    index.html
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	params.json

	new file:   .gitignore
	new file:   Makefile
	new file:   content/pages/about.rst
	new file:   develop_server.sh
	new file:   output/archives.html
	new file:   output/categories.html
	renamed:    index.html -> output/index.html
	new file:   output/pages/about-this-blog.html
	new file:   output/tags.html
	new file:   output/theme/css/main.css
	new file:   output/theme/css/pygment.css
	new file:   output/theme/css/reset.css
	new file:   output/theme/css/typogrify.css
	new file:   output/theme/css/wide.css
	new file:   output/theme/images/icons/aboutme.png
	new file:   output/theme/images/icons/bitbucket.png
	new file:   output/theme/images/icons/delicious.png
	new file:   output/theme/images/icons/facebook.png
new file:   output/theme/images/icons/github.png
	new file:   output/theme/images/icons/gitorious.png
	new file:   output/theme/images/icons/gittip.png
	new file:   output/theme/images/icons/google-groups.png
	new file:   output/theme/images/icons/google-plus.png
	new file:   output/theme/images/icons/hackernews.png
	new file:   output/theme/images/icons/lastfm.png
	new file:   output/theme/images/icons/linkedin.png
	new file:   output/theme/images/icons/reddit.png
	new file:   output/theme/images/icons/rss.png
	new file:   output/theme/images/icons/slideshare.png
	new file:   output/theme/images/icons/speakerdeck.png
	new file:   output/theme/images/icons/twitter.png
	new file:   output/theme/images/icons/vimeo.png
	new file:   output/theme/images/icons/youtube.png
	new file:   pelicanconf.py
	new file:   publishconf.py