Modified gitignore to ignore *.db and *.ctxt
Modified Trainer to have a getName function and also added simple agent AI
Merge branch 'master' of https://github.com/cthomp18/Pokemon

Conflicts:
	PokemonWorld.java
Get rid of merge conflict PokemonWorld