e
Merge commit '4394290252ca5f35bd97cf295287c384ab01770e' into JOY
sef
.
..
final
button created
Grid fixed
.
Merge branch 'origin/aries'

Conflicts:
	main.js
	src/Game/Doctor.js
	src/Game/LayerGameBg.js
	src/Game/LayerGameCharacter.js
	src/resource.js
lives function added
Game end added
Game Over
2 types of doctor
Merge branch 'origin/Yingjie'
hhhhh
Merge branch 'JOY'
Medicine bullet
Coffee
Merge branch 'aries'