Made edit exam work
Started to add questions
fixed merge conflicts