Skeleton done
Finalizing
Merge branch 'master' of https://github.com/tranchri/csc207-hw6