added form in edit view, and added a variable in the edit controller
reset my name to Yaniv on database
tried to fix conflict part 2