formatert
jau
j
map og levelfiks
merge of head failed
Hei
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt

Conflicts:
	res/img/feilsvar.png
	res/img/riktigsvar.png
	src/GameElements/DialogBox.java
	src/Listeners/GameMenuMouseListener.java
	src/Main/GamePanel.java
	src/Player/Player.java
	src/Settings/PlayerSettings.java
	test/Quiz/QuizTest.java
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt

Conflicts:
	src/Main/GamePanel.java
Merge branch 'master' of https://github.com/runeaa/Spillprosjekt