hallo
Merge branch 'master' of https://github.com/SandlerRyan/cs179
some fixed