merge master/Combat
merge master/Stats
merge master/Generation
merge master/Adventuring
Merge master/Attributes
merge master/Conditions
merge master/CoreMagicItems
merge master/Equipment
merge master/Latex stuff
merge master/Magic
merge master/Races
merge master/Rituals
merge master/Skills
merge master/SpellLists
merge master/vimtricks
merge master/Classes
merge master/Feats
merge master/SpellDescriptions
remove "ready action" feats
only start using style feats during action phase