Basic changes asked for. Still not tested.
Merge branch 'master' of https://github.com/Solanar/CMPUT410-Project