comp 421 q4
Merge branch 'master' of github.com:timcolonel/socs