a little bit of robber code
Merge branch 'master' of https://github.com/Databean/warsofcatan
Merge branch 'master' of https://github.com/Databean/warsofcatan
added robber sprite and render it on the board at (0,4)
did some stuff with payout that we'll overwrite
Merge remote-tracking branch 'origin' into robber_finishing
moving the robber now steals one resource from the owner of the tile you move it to. Still need more sophisticated logic and UI to handle multiple owners of one tile
Added a parameterized test
attempted fix for travis
Removed messy preprocessor directives
another attempted travis fix
hack using gtest internals
knight card now mirrors robber moving functionality from ROBBER state
rolling a 7 now robs half of all player's resources iff they have more than 7 resource cards
Made parameter generation not use testing::Combine
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