added edit item
fixed conflicts and fixed update bug
Merge pull request #57 from wgallop99/master

fixed update bug