not sure what changed..
Merge branch 'master_inc'

Conflicts:
	RNG.lua
adding Tengu-no-Hane
not usinga  set for ammo
adding Xaddi Mail
not sure what i did here
adding Tripudio to DRG
adding SJ macro pallette
adding gear
adding gear
adding Xaddi mail
adding gear
adding FC set
adjusting idle
trying to fix weird error with customclass
not sure why customclass was being cleared. i didn't do it!
adding stave set for proc
commiting changes
Merge branch 'master_inc'

Conflicts:
	DRK.lua
	NIN.lua