first commit
merge conflict
working with Dish class
dish class done
added order class as an attribute for User