Combat
CombatFSM_CombatTest_Complete_1

First finished instance of CombatFSM.
merge
Merge remote-tracking branch 'upstream/master'
slots in equipslots

made a generic enum to handle slots, made everything reference that
added gitignore
thing
unique item support + item level
streamlining equipmentfactory
asdf
cleanup
helix helm

now appropriate for all ages!
Merge pull request #13 from peachesandcorn/master

fixed slots, misc