Merge branch 'aries'
sad
Merge branch 'aries'
adjusted the numbers to make the game more playable
Merge branch 'aries'
sad
Merge branch 'JOY'

Conflicts:
	src/Game/Bacteria.js
	src/config/Level.js
Merge branch 'Yingjie'

Conflicts:
	src/Game/Bacteria.js
	src/config/Level.js
Merge branch 'sercan'

Conflicts:
	src/About/LayerAboutBg.js
	src/Game/LayerGameCharacter.js
	src/config/BacteriaType.js
v
Merge branch 'origin/aries'