Added .gitignore
Made dialog better in battling
Merge branch 'master' into Trade+Random