added functionality to Quiz
Merge branch 'master' of github.com:AndreasArne/DV1431