Merge branch 'master' of https://github.com/xenphilos/CSC478-DoodleFighter