killing it softly
Merge branch 'master' of https://github.com/msheets/cs153