first commit
here is most of combat stuff
Merge https://github.com/scotera/cs335