added addItem function
first commit
Fixed conflict