collisiontest ändrat lite så det typ ser bra ut iaf
Making a merge
Merge branch 'master' of https://github.com/LinneaMalcherek/MoS_Projekt

Conflicts:
	javascript_test/index.html