Added ViewButtonText
Added ViewButtonText::setText
Added player buttons
Added GameView::removeElement
Added blank trading view
Added resource selection
Removed map::emplace to support older g++ compilers
Made ViewButton not templated
Using std::array for TradingView
Added buttons with callbacks for trade accept/cancel
Trading offers and counter offer windows implemented
Fixed warning on {}
Fix for initiating/receiving
Added some comments
Actually does trades now
Fixed merge conflicts
Merge pull request #29 from Databean/tradingUI

Trading ui
Merge branch 'move_dice'
Fixed mah makefile.

Love,

Marty
Merge branch 'master' of https://github.com/Databean/warsofcatan into refactor_and_test_dice