it told me to commit so here I am
Merge branch 'master' of https://github.com/rrdbn4/CS5405Project