Fixes merge conflict in outfits index
Merge pull request #27 from kamoh/ben_work

Fixes merge conflict in outfits index