Began work on combat subsystem, put in some basic code for it
Merge remote-tracking branch 'origin/master'
Put in some groundwork for battle system
Merge remote-tracking branch 'origin/master'