Fixed some stuff
Added window class
Merge branch 'master' of https://github.com/Phlank/Pokemon
Fixed some stuff