Fixed file extension
Edited question 4
Edited question 5
Edited question 6
Edited question 8
Edited question 10
Merge branch 'j'