Sisi angry
Merge branch 'newmaster' of https://github.com/RaoZiJian/LoriFight into newmaster

Conflicts:
	LoriFight/src/actor/Enemy.js