If Musk is wrong and there are still jobs in the future then they are likely to be augmented by two types of technology: digital and robotics. The former will be in high end services, the latter in advanced manufacturing. Our current education system largely only caters to the former.
