fix för redovisning
Merge branch 'backup' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup

Conflicts:
	src/player.cpp
Merge branch 'backup' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup

Conflicts:
	highscore.txt
	src/level.cpp
	src/player.cpp