Refactored some things and added new pvp system.
Merge remote-tracking branch 'origin/master'