deleted timers
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Dish.java
	src/MenuItem.java