updated main
Merge branch 'master' of https://github.com/brianc217/cs205_final
possibly works