Update Pokemon.cs
Merge pull request #1 from Legendary27/patch-1

Update Pokemon.cs
Added an enemy trainer who challenges you to a battle. He doesn't actually do much yet.
Conflict Resolve
bug fix