oprydning
Merge branch 'master' of https://github.com/danielkokott/cafekokott

Conflicts:
	web/index.html
	web/workinprogress.html