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