Added encounter
Merge branch 'master' of https://github.com/MasterIV/igj7