Added a getMoveType()
Added setLevel()
Merge branch 'master' of github.com:Jdog653/Pokemon