The evolution of massive stars