a6941c0fb6
Conflicts: src/GameWorld.cpp src/GameWorld.h vs11/Returngeance/Returngeance.vcxproj vs11/Returngeance/Returngeance.vcxproj.filters