taking out circular dependencies from board model.
Server Offer Trade and update board piece
Merge branch 'master' of https://github.com/abe-austin/Catan
discard works fully
Merge branch 'master' of https://github.com/abe-austin/Catan
merger