updates
Merge branch 'master' of https://github.com/Oiawesome/Kalos-Showdown