update ervingarea
Merge branch 'master' of https://github.com/cristeahub/opsys

Conflicts:
	ovinger/src/oving2/ServingArea.java