Started creating the other tokens. Forgot to commit somewhere in the middle.
Adding more tests
Committing more tests
Adding some functionality to some of the pokemon tokens
Adding some functionality to some of the pokemon tokens
Adding some functionality to some of the pokemon tokens
Need to commit before going back to master
Fixed merge problem. Hopefully
Trying to update the master. Thought I did last night
Merge branch 'master' of github.com:jemacaslan/pokemon
Merge branch 'jemacaslan'
restructured our documentation