Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Gotta commit to update.
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/client/ClientProxy.java
	minecraft/pixelmon/config/PixelmonItems.java
Fixed rods up so they are only 1 class.

I had repeated code for the rods. Made it all into 1.
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Finished with rods. Had to remove a chat output line.
Made sure none of the stuff I was working on showed up.
FINAL FINAL Rods. The rods now read the Water pokemon spawn list, and are not manual.
Merge pull request #1101 from Xwaffle1/master

Final Fishing Rods