update gitignore
solve merge
resolve
resolve stash
Add dialogue box and forests
Add battles