android 設定
Merge branch 'master' of https://github.com/peng571/MakeAGame.git
?
血條 & 技能完成
Merge branch 'master' of https://github.com/peng571/MakeAGame.git

Conflicts:
	core/src/com/makeagame/core/Engine.java
	core/src/com/makeagame/magerevenge/MakeAGame.java
	core/src/com/makeagame/magerevenge/ViewField.java