Putting all files up
Merge branch 'master' of https://github.com/aaron-effron/cpsc424-hw5
"Just cuz"