fix master
Merge branch 'master' of github.com:J3AI/game-table
Merge branch 'master' of github.com:J3AI/game-table
resolve stash conflict
lines back inshow
chat messages improved