Misc testing
Merging in current master
Merge remote-tracking branch 'origin/master' into view_dev_cards
Adding back the parameterized test
Fixed some G++ warnings
Fixed trading
Merge remote-tracking branch 'origin/master' into view_dev_cards
Merge pull request #57 from Databean/addBackParameterizedTest

Adding back the parameterized test
Merge pull request #58 from Databean/removeWarnings

Fixed some G++ warnings
Merge pull request #59 from Databean/fixedTrading

Fixed trading
Upgrade to Wonder button and action
Added  resource& dev card show/hide functionality, but can't get the button to draw properly.
Fixed city error
Show/hide card totals is now implemented
Merge pull request #60 from Databean/cp_UI2

Upgrade to Wonder button and action
Merge pull request #61 from Databean/view_dev_cards

Show/Hide Card Totals
moved Wonder button so it doesn't overlap gameboard
Merge pull request #62 from Databean/wonder_reposition_button

moved Wonder button so it doesn't overlap gameboard
Removed resource print statement
Merge branch 'master' into tradeWithBank

Conflicts:
	src/GameController.cpp