formatting
Merge branch 'master' of https://github.com/emcallaway/csc207-hw6