adding new hotness
Merge branch 'master' of github.com:AlanWarren/gearswap

Conflicts:
	NIN_gear.lua