Added State Machine for ExamStatus
Fixed merge conflicts