Combat System and Website Updates

Major:
-Combat System
Minor:
-Website/Database