Changed hardcoded roll verification to be more procedural
Merge branch 'master' into refactorBoardInitialization
Committing to merge in refactorBoardInitialization
Merge branch 'refactorBoardInitialization' into serialization

Conflicts:
	src/GameBoard.cpp
Added city serialization
Merge pull request #3 from Databean/serialization

Adding Settlement/City Serialization
Merged main into deck_operations in preparation for a pull request.  Currently compiles and passes all tests on my local machine