test with syntax highlighting
Merge branch 'master' of github.com:Maltretieren/maltretieren.github.com

Conflicts:
	_posts/core-samples/2014-02-17-ideas.md