merging
Merge branch 'master_inc'
Merge branch 'master_inc'
re-ordering overkill
changing sam to a mode
removing SAM
commenting out stp 3-hit
renaming to RA
removing ws_mode
adding jinpu set
Merge branch 'master_inc'

Conflicts:
	RNG.lua
fixing changing RangedAttack to RA
fixed naming
adding comment
removing sam 3-hit for now
adding field for autora
set option for autora specified
trying to get toggle to work
fixing typo. made toggle work