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

Conflicts:
	style/colors.css