Added tests for victory points and the buyCard function
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'
Merge branch 'master' into KnightImplementation_2

Conflicts:
	src/GameController.cpp
merged in Alex's robber stuff, and my knight stuff. Stuff should work...
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