uprava pokemona
delete trenera
Merge remote-tracking branch 'origin/master'

Conflicts:
	IWoP2/src/data/Main.java
Merge branch 'master' of https://github.com/Fjerka/IWoP