fixed stuff
Merge branch 'master' of https://github.com/sabrewolf/ExpToGive

Conflicts:
	src/me/sabrewolf/skyservers/pixelmon/Main.java