comp 330 assig2
Merge branch 'master' of https://github.com/timcolonel/socs