Merge branch 'multiplayer-es' of https://github.com/irtusb/gitmagic