updated items
Merge branch 'master' of https://github.com/sflem1993/oresanditems