added water maker and foodmaker divs on gameplay page
fixing merge conflict in css page