Removed shield collision handling
Merge branch 'master' of https://github.com/olafmaas/contextprojectgroep6

Conflicts:
	Game/src/canvas_script.js