Preliminary combat methods and struct relocations
Thread and SQL changes
Merge pull request #1 from PyroSamurai/combat

Preliminary combat methods and struct relocations
Merge pull request #2 from PyroSamurai/Optimize

Thread and SQL changes
Merge pull request #4 from PyroSamurai/master

Merging branches, updating master