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

Conflicts:
	server/vworld.pl