submission for two
Merge branch 'master' of github.com:bl4rg/CSC180