first commit
:
Merge branch 'master' of https://github.com/mantor3000/mantor3000.github.com

Conflicts:
	archives.html
	categories.html
	index.html
	my-super-post.html
	tag/pelican.html
	tag/publishing.html