Added stufff
Merge branch 'master' of https://github.com/yellowjello/cpsc310gitlab
Boo
Fixed conflict