merge fix
Merge branch 'master' of github.com:Theliraan/Final-exams-answers

Merge conflicting branches.