Kontakt
Merge branch 'master' of https://github.com/dirgni/CoffeeBreak.git

Conflicts:
	CoffeeBreak/WebContent/kujundus.css