collectibles now correctly displaying
fixed merge conflict
Merge pull request #34 from jeffdill2/joshua-smith

Joshua smith