Introduced generated_traps which are braodcasted to both players
Merge remote-tracking branch 'origin/master'