added items table and debugged
removed conflicts
Merge pull request #14 from bamiano/master

debugging and items model/table