updates items table
fixes merge conflict
Merge pull request #178 from chadbrading/master

updates items table