tesr
Merge branch 'master' of https://github.com/Maltretieren/maltretieren.github.com

Conflicts:
	_posts/documentation/2014-10-30-documentation.md