committing soph fall courses
Merge branch 'master' of https://github.com/colinmcd94/courses

merging with local branch

committing merge