Corrected description display
fix merge conflict
Merge pull request #71 from paddatrapper/dev

Updated direction layout bug
equip/unequip clean up of pthayer3
equip/unequip system development
equip/unequip system development
Merge remote-tracking branch 'upstream/master' into dev
fixed error in items.json which stopped proper save
reloaded proper test profile to fix malformed json
removed unecessary tests