angular added
game-master starting game done
merged conflicts after game-master