poäng
Merge branch 'backup' of https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup
Merge branch 'backup' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup

Conflicts:
	highscore.txt
Merge branch 'backup' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup
Merge branch 'backup' of https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup
små grejer
Merge branch 'backup' of
https://github.com/nhkim91/TDDC76-Projekt-SI.git into backup

Conflicts:
	src/player.cpp
	src/space_invader.cpp