fixing edit form
finishing edit form
fixing image upload field
fixing login
fixing merge conflict
Merge branch 'master' of github.com:franciuipapi/Project2