Updated to mc 1.6.2 - Check readme.md!
Merged rods and hooks into single classes - needs testing
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/client/ClientProxy.java
	minecraft/pixelmon/config/PixelmonItems.java