fucking scriptease screwed everything up and I fix it
Merge branch 'master' of https://github.com/CMPUT250LeonidProductions/Duality
fixed scriptease bug
Merge branch 'master' of https://github.com/CMPUT250LeonidProductions/Duality