homework stuff due tonight

Canopy doesn't seem to like LaTeX formatting and I can't use dirac1
because it won't let me pull and merge the master branch.