Client + Dish
Merge branch 'master' of https://github.com/dsarkozi/Gourmet.git

Conflicts:
	src/com/gourmet6/Client.java