minor changes
Merge branch 'master' of https://github.com/MichaelHPatterson/final_project
ksjfk
merged changes