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

Conflicts:
	index.html