Fix Trick-or-Treat and Forest's Curse

They add a type to the Pokemon, not change it's type completely.
Proper start message for Trick-or-Treat

and Forest's Curse
Update hasType to work with any number of types
Use .concat() instead of .push()
Remove Conditionals
Merge pull request #479 from V4Victini/typechange

New kind of type changes