Merge terminal_game with master