ss
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	.gitignore
	src/main/java/com/self/mahunter/service/BattleService.java
	xmlsample/fairy_history.xml
modify set card