Merge branch 'master' of https://github.com/PetterSa/HealthyCateringLTD

Conflicts:
	HealthyCatering/src/gui/MainWindow.java