first commit
-add the pelican folders blog
Merge branch 'gh-pages'
- update theme
-add theme again
-this is a test
-update post 30.08.2013
Merge branch 'master' into gh-pages

Conflicts:
	good.html
	my-super-post.html
	output/feeds/all.atom.xml
	pelican.pid
	pelicanconf.pyc
	publishconf.pyc
	srv.pid
	tag/.html