Oppgave 2/filip og question-JSONFILE
Merge branch 'master' of https://github.com/henjak/innlevering3

Conflicts:
	del3/js/questions.js