revised final (everything should be correct)
Merge branch 'master' of https://github.com/zsdfewm/CS536