Merge pull request #59 from brentspector/master

Fixed Erros with Items, Updated Fight and MapEvent