local temp
Merge branch 'master' of https://github.com/MagitTowerTHU/MagitTower

Conflicts:
	MagicTower/MagicTower.pro.user
what commit......