Testing git merge.
Testing git commit.
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project

Conflicts:
	HealthyCateringWeb/web/index.xhtml
Dritt