merge
Merge branch 'master' of https://github.com/epha/kompendium

Conflicts:
	data/kompendium.json
	index.html