Merge pull request #15 from 1101811b/pvp_system

Pvp system
Made some changes to the PvP system
Merge github.com:1101811b/DIM3-Team-Q-Fish into pvp_system