fixed some things that were messed up
Merge branch 'master' of https://github.com/nestorga/cs169