Added a pokemon class which contains all relative fields to each pokemon
character that is in our game.  Also created junit tests to test all
methods in the pokemon class
Created a terrain class to contain all the enums for the different
terrains we expect to use in the game
Merge git://github.com/dhill3/SoftwareEngineeringProject