opgave 1
Merge branch 'master' of https://github.com/knarfi/Kantine

Conflicts:
	README.TXT
	doc/allclasses-frame.html
	doc/allclasses-noframe.html
	doc/constant-values.html
	doc/index.html
	doc/logfile.txt
	doc/package-frame.html
	doc/package-summary.html