The evolution of the quark-gluon plasma