Fixed some errors and issue #14.

Capturing pokemon now happens inside the Trainer object. usersPokemon is no longer used.

Trainer.java

@@ -23,6 +23,10 @@ public class Trainer {
 		return this.pokemon;
 	}
 	
+	public void addPokemon(Pokemon pokemon) {
+		this.pokemon.add(pokemon);
+	}
+	
 	public ArrayList<Pokemon> getConsciousPokemon() {
 		ArrayList<Pokemon> pokemon = new ArrayList<Pokemon>();
 		for (Pokemon singlePokemon : this.pokemon) {