Assignment 2 - Johnathan Ashley/Andrew Michaud

I would like some docstrings on these, though, and for the given docstrings to be attached to the correct function definition.