Merge branch 'master' of https://github.com/IEEE-NITK/Pokemon
Merge branch 'master' of https://github.com/IEEE-NITK/Pokemon
Added UserPokemon
Merge pull request #5 from thejdeep/master

Added User pokemon