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
Deck shuffling is implemented and now compiles
Added city serialization
Discard pile and reshuffling implemented.  Need to implement case where both discard pile and deck are empty
Merge pull request #3 from Databean/serialization

Adding Settlement/City Serialization
Deck functions now even when discard and deck are empty
Adding unit tests for deck reshuffling from discard pile
Merged main into deck_operations in preparation for a pull request.  Currently compiles and passes all tests on my local machine
Fixed memory leak in the deck test file
Merge pull request #4 from Databean/deck_operations

Deck operations finished
Updates road checks to include the check that the road is built off
another road or a settlement. Added buying road functions in Player and
GameBoard. Changed the corners variable in GameBoard to use CornerPieces
instead of GamePieces. Renamed "setters" in Player class, they are now
called adders like their functionality.
Reorganized view functionality to align with MVC
Merge pull request #5 from Databean/road_implementation

Updates road checks to include the check that the road is built off
Adding include to fix travis build
Changed resource initialization to be represented by creating concentric rings of increasing size
Merge pull request #6 from Databean/refactorBoardInitialization

Changed resource initialization to be represented by creating concentric...
Merge branch 'master' into renderCornerPieces