basically done
Merge branch 'master' of https://github.com/JoeyAndres/CMPUT333_ASSIGN01