Some minor change that Git is complaining about.
Merge branch 'master' of github.com:ohearnk/CS467
Merge branch 'master' of github.com:ohearnk/CS467
Chris journal 9/05