La til en HALOOO
Merge branch 'master' of https://github.com/audunx/Bordtennis

Conflicts:
	file2