Some added things I guess
Merge branch 'master' of github.com:benjamin-l-johnson/CS2240