last work before pushing to a new branch on github
Merge branch 'master' of https://github.com/Anniepoo/games4diversity into nonthreaded