cleaned up some stuff
Merge branch 'master' of github.com:mbStavola/CUS1156-GroupAssignment