Can't pull.
Updated some docstrings.
Merge branch 'master' of github.com:CharlieMouton/FE_Final_Project
Updating merge.