03.12.2013 um 14:22
Merge branch 'master' of github.com:mutbuerger/mutbuerger.github.com into source

Conflicts:
	source/_includes/after_footer.html
	source/_includes/archive_post.html
	source/_includes/article.html
	source/_includes/asides/twitter.html
	source/_includes/banner.html
	source/_includes/custom/footer.html
	source/_includes/custom/navigation.html
	source/_includes/disqus.html
	source/_includes/google_plus_one.html
	source/_includes/head.html
	source/_includes/header.html
	source/_includes/post/categories.html
	source/_includes/post/sharing.html
	source/_layouts/category_index.html
	source/_layouts/default.html
	source/_layouts/post.html
	source/images/fancybox/blank.gif
	source/images/fancybox/fancybox_loading.gif
	source/images/fancybox/fancybox_sprite.png
	source/images/loading_gray.gif
	source/images/loading_pacman.gif
	source/images/social/delicious.png
	source/images/social/facebook.png
	source/images/social/github.png
	source/images/social/google.png
	source/images/social/linkedin.png
	source/images/social/pinterest.png
	source/images/social/rss.png
	source/images/social/twitter.png
	source/index.html
	source/javascripts/ender.js
	source/javascripts/github.js
	source/javascripts/jquery.fancybox.pack.js
	source/javascripts/libs/ender.js
	source/javascripts/slash.js
	source/robots.txt
working cleanpress theme