Should it be ‘the course which I took’ or 'the course that I took’?

Taylor Houston has the answer to this and other knotty grammar problems in her two week crash course.