lots of minor changes
Merge branch 'master' of https://github.com/CMPUT250LeonidProductions/Duality