ALL LABELS
Merge branch 'master' of github.com:myrrlyn/Klaus-SLP

Conflicts:
	pictures.html