fix conflicts
Merge branch 'master' of https://github.com/BOLDInnovationGroup/Bold-Innovation-Group-The-Game--Origins