dubs update 1.5

next mon i gotta do is meganium
Merge branch 'patch-1' of github.com:Audiosurfer/Pokemon-Showdown into Audiosurfer-patch-1
Merge pull request #1016 from Audiosurfer/patch-1

dubs update 1.5