fix
fix
id change
fix & new cards
fix name
fix& new script
Merge remote-tracking branch 'upstream/master'

Conflicts:
	script/c37364101.lua
Merge remote-tracking branch 'origin/master'
name
revert
Merge pull request #111 from sidschingis/master

fix