Updated Enedok's code which sometimes caused concurrent modifications
Merge branch 'master' of git@github.com:FlyingPikachu/DiscoSheep-.git
Non-fast forward fix~