quadruple stuff i missed adding in first time round
Merge branch 'master' of github.com:danielfinke/cpsc425