Add item model and tests
Add items controller and CRUD tests
fixed merge conflicts;