Made code more server-independent
Merge branch 'master' of github.com:InFreefall/magic-spieler