Manager og Salesman stuff
Merge branch 'master' of https://github.com/PetterSa/HealthyCateringLTD

Conflicts:
	HealthyCatering/src/users/Manager.java
	HealthyCatering/src/users/Salesman.java