Added locations of fields and deck/discard piles
Uncommented Stuff

Commented things so I could see the rectangles location
Fixed Merger
Merge branch 'Fixing-Content' of https://github.com/vu1p3n0x/CS206Project into Fixing-Content