Merge branch 'clientbranch'
Merge branch 'master' of https://github.com/brettferdosi/backgammon