Merge pull request #1 from mwhittaker/PHYS-2214-prelim1

Phys 2214 Prelim 1