reinit repo
Merge branch 'master' of github.com:mortik/mortik.de

Conflicts:
	Gemfile.lock
	README.md
	source/layouts/_nav.haml
	source/layouts/_sidebar.haml
	source/layouts/blog.haml
	source/layouts/layout.haml