Edit function
blabla
Fixed merge conflicts
Edit function working
Merge branch 'edit'