change pokemon screen works
Merge branch 'db_revision' of github.com:davidgbe/csci_201_final into db_revision