merger mostly working, except button wont disappear for other players
and need to implement logic for holding selling and trading
Merge pull request #7 from maabernethy/ember

merger mostly working, except button wont disappear for other players