modified gitignore
Merge branch 'master' of github.com:gyf1214/RPG