Finished energy, intensity, and momentum
Merge pull request #7 from mwhittaker/PHYS-2214-final

Physics Final