Merge branch 'master' of https://github.com/Eyal-Shalev/Ass3

Conflicts:
	src/com/restaurant/kitchen/Dish.java
fix conflict