started pokemon.java
finished the stubs still have to make test class
 finished making stubs
 finished typing test
finished test
passes all tests
Merge pull request #7 from hmarasigan/master

Hans Lab04 submission