I'm starting to flush out a working body for the CatanMap class and all of the subimplementations for the smaller classes.
Trying to work with merge conflicts