reandom updates
Merge branch 'master' of github.com:jemacaslan/pokemon into jemacaslan
Haley and I did some debugging, and I've fixed the algorithm bugs that we found
Merge branch 'master' of github.com:jemacaslan/pokemon