adding more things
Merge branch 'master' of https://github.com/abbbystevens/csc207-hw6