pull angular test
merged with gabe
test passed
Merge pull request #73 from JakeRawr/master

add upload item and edit existing item