Conflict Fix #2
Added a new file
Conflict fix
mend
Merge pull request #6 from UBC-VCL/pa-lletTown

Added a pokemon