quiz
Merge branch 'master' of https://github.com/henjak/innlevering3

Conflicts:
	del3/css/style.css