Added tests for victory points and the buyCard function
Added a parameterized test
attempted fix for travis
Removed messy preprocessor directives
another attempted travis fix
hack using gtest internals
Made parameter generation not use testing::Combine
Got some straight up Knight action in here. Also rearranged some things
and made some descriptive state UI stuff
Added tests, hopefully I did it right
fixed a 'CHECK' I forgot to replace with an 'ASSERT_EQ'
removed some problematic dead code I had been using to spike
Merge pull request #48 from Databean/parameterizedTesting

Parameterized testing
Merge pull request #49 from Databean/robber_finishing

Robber finishing
Merge branch 'master' into KnightImplementation_2

Conflicts:
	src/GameController.cpp
merged in Alex's robber stuff, and my knight stuff. Stuff should work...
Merge pull request #52 from Databean/remove_stupid_line

removed some problematic dead code I had been using to spike. which was breaking master on my machine whoops
Merge branch 'master' into DevCardUImerger

Conflicts:
	include/GameBoard.h
	src/GameBoard.cpp
	src/GameController.cpp
Trying to fix conflicts and get this working.
A change I did to the controller got undone, redoing it
Merge pull request #54 from Databean/KnightImplementation_2

Knight implementation 2