test
test again
Merge branch 'master' of github.com:schneiderik/schneiderik

Conflicts:
	_posts/2013-12-11-november-dailies.md