Match is tested and corrected for bugs
Merge branch 'master' of https://github.com/mApple/Arena.git