Merge pull request #1 from ellina-s/ellina

Ellina
Finished two table operations
Fixed conflict in itemTest.java