merge
Merge branch 'master' of github.com:MagicTowerTHU/MagicTower
modified position of message
mapping 25%
Merge branch 'master' of github.com:MagicTowerTHU/MagicTower