game playing
game end
Merge branch 'dev' into ui
remove detail
Merge remote-tracking branch 'origin/ui' into dev
Merge branch 'dev' into ui
add join js