setting debug
fix conflict and make a .gitignore
Merge branch 'master' of github4lucky:lshy1993/lucky_game

Conflicts:
	Data/scenario/setting.ks