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

Conflicts:
	assets/js/octokit-0.9.19/octokit.js