pushed changes to main.java to correspond with changes to battle
made acessing names/pokes without spaces (and other punctuation) work