as module no error
as module no error 2
singletons fixed
no singletons

Merge branch 'master' of https://github.com/Anniepoo/games4diversity