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
Update CommandSpawn.java
Double Faint message, nullpointer fix.
Removing a Faint message.. not needed
Heal Fix
Merge pull request #1 from Rhonim/Several-Fixes

Merging to master..
Merge pull request #1096 from Rhonim/Several-Fixes

Several fixes
tried to fix up movespeed.  Mojang have completely stuffed it up
Fixed the effectiveness of ground to steel.

Fixed the effectiveness of ground to steel.
Merge pull request #1097 from Rhonim/Ground-vs-Steel

Ground vs steel
Merge pull request #2 from Rhonim/Ground-vs-Steel

Fixed the effectiveness of ground to steel.
Fix to Nullpointer

Fixes to calling player2/player1 when it may have never existed
Merge pull request #1098 from Rhonim/Trade-Machine-Fix

Trade machine fix
various bits and pieces
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
updated stuff a bit
got music going in 1.6