Changed Togekiss Typing

Togekiss is now Fairy/Flying
Merge pull request #419 from mal20k/master

Changed Togekiss Typing